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/35e23d1a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35e23d1a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35e23d1a Branch: refs/heads/camel-2.13.x Commit: 35e23d1ad3585891e62b815a70171db51d2fbf68 Parents: dacbfc5 Author: sebbrousse <seb.brou...@gmail.com> Authored: Mon Aug 11 20:39:11 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 11 20:53:41 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/35e23d1a/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 d8af587..1afc79e 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 @@ -93,7 +93,9 @@ public class ElasticsearchEndpoint extends DefaultEndpoint { LOG.info("Leaving ElasticSearch cluster " + config.getClusterName()); } client.close(); - node.close(); + if (node != null) { + node.close(); + } super.doStop(); }
