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 2014/05/04 10:25:13 UTC
[1/3] git commit: [CAMEL-7306]: key is optional. Avoid NPE
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x ad26ff0bd -> 86060eed7
refs/heads/master a6fb1df10 -> 8b78f5ca9
[CAMEL-7306]: key is optional. Avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e317e7b4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e317e7b4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e317e7b4
Branch: refs/heads/master
Commit: e317e7b470f03d14fe51b9efcc6d251e869c8224
Parents: cd8da7d
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Tue Apr 8 15:21:54 2014 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Tue Apr 8 15:21:54 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/kafka/KafkaEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e317e7b4/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index 9bdb100..002d15e 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -89,7 +89,9 @@ public class KafkaEndpoint extends DefaultEndpoint {
Message message = new DefaultMessage();
message.setHeader(KafkaConstants.PARTITION, mm.partition());
message.setHeader(KafkaConstants.TOPIC, mm.topic());
- message.setHeader(KafkaConstants.KEY, new String(mm.key()));
+ if (mm.key() != null) {
+ message.setHeader(KafkaConstants.KEY, new String(mm.key()));
+ }
message.setBody(mm.message());
exchange.setIn(message);
[3/3] git commit: [CAMEL-7306]: key is optional. Avoid NPE
Posted by da...@apache.org.
[CAMEL-7306]: key is optional. Avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86060eed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86060eed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86060eed
Branch: refs/heads/camel-2.13.x
Commit: 86060eed7ddc95f1415a6383293961da98a6ae44
Parents: ad26ff0
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Tue Apr 8 15:21:54 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun May 4 10:24:57 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/kafka/KafkaEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86060eed/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
index 9bdb100..002d15e 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaEndpoint.java
@@ -89,7 +89,9 @@ public class KafkaEndpoint extends DefaultEndpoint {
Message message = new DefaultMessage();
message.setHeader(KafkaConstants.PARTITION, mm.partition());
message.setHeader(KafkaConstants.TOPIC, mm.topic());
- message.setHeader(KafkaConstants.KEY, new String(mm.key()));
+ if (mm.key() != null) {
+ message.setHeader(KafkaConstants.KEY, new String(mm.key()));
+ }
message.setBody(mm.message());
exchange.setIn(message);
[2/3] git commit: Merge branch 'CAMEL-7306' of
https://github.com/grgrzybek/camel
Posted by da...@apache.org.
Merge branch 'CAMEL-7306' of https://github.com/grgrzybek/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b78f5ca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b78f5ca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b78f5ca
Branch: refs/heads/master
Commit: 8b78f5ca9f9d6cb6a0a1cabffcf962b8a1fbc597
Parents: a6fb1df e317e7b
Author: Claus Ibsen <da...@apache.org>
Authored: Sun May 4 10:24:36 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun May 4 10:24:36 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/kafka/KafkaEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------