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 B8A8010C0F for ; Sun, 4 May 2014 08:25:19 +0000 (UTC) Received: (qmail 47320 invoked by uid 500); 4 May 2014 08:25:17 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 47261 invoked by uid 500); 4 May 2014 08:25:16 -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 47153 invoked by uid 99); 4 May 2014 08:25:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2014 08:25:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8CC0A89BAF7; Sun, 4 May 2014 08:25:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Sun, 04 May 2014 08:25:15 -0000 Message-Id: <97a19545b79e4f9f8d88d882234c6232@git.apache.org> In-Reply-To: <65fbee19900a41c3ae20f899e2d94bb0@git.apache.org> References: <65fbee19900a41c3ae20f899e2d94bb0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: [CAMEL-7306]: key is optional. Avoid NPE [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 Authored: Tue Apr 8 15:21:54 2014 +0200 Committer: Claus Ibsen 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);