Repository: camel Updated Branches: refs/heads/camel-2.12.x 5a99e0b68 -> 4bbd0acc1 refs/heads/camel-2.13.x dacbfc542 -> 35e23d1ad refs/heads/master 00e86dbbc -> fe35d1be5
Fix CAMEL-7680 : Throw NPE when stopping if transport client is used Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe35d1be Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe35d1be Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe35d1be Branch: refs/heads/master Commit: fe35d1be5d7f8afc4b0c64b40a557931fcc6c802 Parents: 00e86db Author: sebbrousse <seb.brou...@gmail.com> Authored: Mon Aug 11 20:39:11 2014 +0200 Committer: sebbrousse <seb.brou...@gmail.com> Committed: Mon Aug 11 20:39:11 2014 +0200 ---------------------------------------------------------------------- .../camel/component/elasticsearch/ElasticsearchEndpoint.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fe35d1be/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java index e88e93c..d31ed30 100644 --- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java +++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java @@ -97,7 +97,9 @@ public class ElasticsearchEndpoint extends DefaultEndpoint { LOG.info("Leaving ElasticSearch cluster " + configuration.getClusterName()); } client.close(); - node.close(); + if (node != null) { + node.close(); + } super.doStop(); }
