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/08/11 20:54:03 UTC
[1/3] git commit: Fix CAMEL-7680 : Throw NPE when stopping if
transport client is used
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 <se...@gmail.com>
Authored: Mon Aug 11 20:39:11 2014 +0200
Committer: sebbrousse <se...@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();
}
[3/3] git commit: Fix CAMEL-7680 : Throw NPE when stopping if
transport client is used
Posted by da...@apache.org.
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/4bbd0acc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bbd0acc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bbd0acc
Branch: refs/heads/camel-2.12.x
Commit: 4bbd0acc1e146adbdab09c1e53917759c7a99bab
Parents: 5a99e0b
Author: sebbrousse <se...@gmail.com>
Authored: Mon Aug 11 20:39:11 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 11 20:53:50 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/4bbd0acc/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 4d002ea..e83e32d 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
@@ -88,7 +88,9 @@ public class ElasticsearchEndpoint extends DefaultEndpoint {
LOG.info("Leaving ElasticSearch cluster " + config.getClusterName());
}
client.close();
- node.close();
+ if (node != null) {
+ node.close();
+ }
super.doStop();
}
[2/3] git commit: Fix CAMEL-7680 : Throw NPE when stopping if
transport client is used
Posted by da...@apache.org.
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 <se...@gmail.com>
Authored: Mon Aug 11 20:39:11 2014 +0200
Committer: Claus Ibsen <da...@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();
}