Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ED8D6182DD for ; Thu, 25 Jun 2015 06:31:54 +0000 (UTC) Received: (qmail 80218 invoked by uid 500); 25 Jun 2015 06:31:54 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 80168 invoked by uid 500); 25 Jun 2015 06:31:54 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 80145 invoked by uid 99); 25 Jun 2015 06:31:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jun 2015 06:31:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FFA1E3662; Thu, 25 Jun 2015 06:31:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Thu, 25 Jun 2015 06:31:56 -0000 Message-Id: <62b224413d484e7eb478d496806bf774@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] camel git commit: CAMEL-8901: NBSP characters in camel-kafka:KafkaConfiguration parameter. Thanks to Matt Henkel for the patch. CAMEL-8901: NBSP characters in camel-kafka:KafkaConfiguration parameter. Thanks to Matt Henkel for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cae427c9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cae427c9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cae427c9 Branch: refs/heads/camel-2.14.x Commit: cae427c959e5e7a7db13e28a1865851707ed573d Parents: b508c4d Author: Claus Ibsen Authored: Thu Jun 25 08:34:49 2015 +0200 Committer: Claus Ibsen Committed: Thu Jun 25 08:37:44 2015 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/kafka/KafkaConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cae427c9/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java index 881ef3c..718710c 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java @@ -116,9 +116,9 @@ public class KafkaConfiguration { addPropertyIfNotNull(props, "auto.offset.reset", getAutoOffsetReset()); addPropertyIfNotNull(props, "consumer.timeout.ms", getConsumerTimeoutMs()); addPropertyIfNotNull(props, "client.id", getClientId()); - addPropertyIfNotNull(props, "zookeeper.session.timeout.ms ", getZookeeperSessionTimeoutMs()); + addPropertyIfNotNull(props, "zookeeper.session.timeout.ms", getZookeeperSessionTimeoutMs()); addPropertyIfNotNull(props, "zookeeper.connection.timeout.ms", getZookeeperConnectionTimeoutMs()); - addPropertyIfNotNull(props, "zookeeper.sync.time.ms ", getZookeeperSyncTimeMs()); + addPropertyIfNotNull(props, "zookeeper.sync.time.ms", getZookeeperSyncTimeMs()); return props; } @@ -128,7 +128,7 @@ public class KafkaConfiguration { props.put(key, value.toString()); } } - + public String getZookeeperConnect() { if (this.zookeeperConnect != null) { return zookeeperConnect; @@ -139,7 +139,7 @@ public class KafkaConfiguration { public void setZookeeperConnect(String zookeeperConnect) { this.zookeeperConnect = zookeeperConnect; - + // connect overrides host and port this.zookeeperHost = null; this.zookeeperPort = -1;