You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/06/25 08:31:54 UTC
[1/3] camel git commit: CAMEL-8901: NBSP characters in
camel-kafka:KafkaConfiguration parameter. Thanks to Matt Henkel for the
patch.
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x b508c4dc6 -> cae427c95
refs/heads/camel-2.15.x 7e3b35101 -> 5f7ff0dfc
refs/heads/master c22af7426 -> 60f734192
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/60f73419
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60f73419
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60f73419
Branch: refs/heads/master
Commit: 60f73419250f1ca0ace5106c81f1d9dac0638619
Parents: c22af74
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 25 08:34:49 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 25 08:34:49 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/60f73419/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 4a2e1ea..5bd8ee6 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
@@ -172,9 +172,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;
}
@@ -184,7 +184,7 @@ public class KafkaConfiguration {
props.put(key, value.toString());
}
}
-
+
public String getZookeeperConnect() {
if (this.zookeeperConnect != null) {
return zookeeperConnect;
@@ -204,7 +204,7 @@ public class KafkaConfiguration {
*/
public void setZookeeperConnect(String zookeeperConnect) {
this.zookeeperConnect = zookeeperConnect;
-
+
// connect overrides host and port
this.zookeeperHost = null;
this.zookeeperPort = -1;
[3/3] camel git commit: CAMEL-8901: NBSP characters in
camel-kafka:KafkaConfiguration parameter. Thanks to Matt Henkel for the
patch.
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Thu Jun 25 08:34:49 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
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;
[2/3] camel git commit: CAMEL-8901: NBSP characters in
camel-kafka:KafkaConfiguration parameter. Thanks to Matt Henkel for the
patch.
Posted by da...@apache.org.
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/5f7ff0df
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5f7ff0df
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5f7ff0df
Branch: refs/heads/camel-2.15.x
Commit: 5f7ff0dfc0518b6f5e4074293e750e8ac1addfeb
Parents: 7e3b351
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 25 08:34:49 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 25 08:37:31 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/5f7ff0df/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 576cb9e..72a208b 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
@@ -166,9 +166,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;
}
@@ -178,7 +178,7 @@ public class KafkaConfiguration {
props.put(key, value.toString());
}
}
-
+
public String getZookeeperConnect() {
if (this.zookeeperConnect != null) {
return zookeeperConnect;
@@ -189,7 +189,7 @@ public class KafkaConfiguration {
public void setZookeeperConnect(String zookeeperConnect) {
this.zookeeperConnect = zookeeperConnect;
-
+
// connect overrides host and port
this.zookeeperHost = null;
this.zookeeperPort = -1;