Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 60663200C36 for ; Fri, 10 Mar 2017 13:35:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5F011160B79; Fri, 10 Mar 2017 12:35:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AF15C160B69 for ; Fri, 10 Mar 2017 13:35:56 +0100 (CET) Received: (qmail 91018 invoked by uid 500); 10 Mar 2017 12:35:55 -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 91005 invoked by uid 99); 10 Mar 2017 12:35:55 -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; Fri, 10 Mar 2017 12:35:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 96393DFE5C; Fri, 10 Mar 2017 12:35:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: acosentino@apache.org To: commits@camel.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-10961: Backported parts of CAMEL-10292 in order to fix possible NPE in ZooKeeperProducer. Date: Fri, 10 Mar 2017 12:35:55 +0000 (UTC) archived-at: Fri, 10 Mar 2017 12:35:57 -0000 Repository: camel Updated Branches: refs/heads/camel-2.18.x 8620ae9e5 -> dc46e915d CAMEL-10961: Backported parts of CAMEL-10292 in order to fix possible NPE in ZooKeeperProducer. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc46e915 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc46e915 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc46e915 Branch: refs/heads/camel-2.18.x Commit: dc46e915da034a0a07ff7348f19b711e0c6e4387 Parents: 8620ae9 Author: Andreas Ländle Authored: Fri Mar 10 13:17:12 2017 +0100 Committer: Andreas Ländle Committed: Fri Mar 10 13:17:12 2017 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/zookeeper/ZooKeeperProducer.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dc46e915/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java index 449a138..37b236e 100644 --- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java +++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperProducer.java @@ -64,6 +64,9 @@ public class ZooKeeperProducer extends DefaultProducer { public void process(Exchange exchange) throws Exception { + if (connection == null) { + connection = this.zkm.getConnection(); + } ProductionContext context = new ProductionContext(connection, exchange); String operation = exchange.getIn().getHeader(ZooKeeperMessage.ZOOKEEPER_OPERATION, String.class);