You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/01/04 07:55:46 UTC
[1/4] camel git commit: CAMEL-8200 Fix the issue of race condition in
JmsProducer for request/response messaging with thanks to Krzysztof
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 3ca1a6d20 -> 35d26ca72
refs/heads/camel-2.14.x 076bb8506 -> 7daa19071
CAMEL-8200 Fix the issue of race condition in JmsProducer for request/response messaging with thanks to Krzysztof
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a35e031e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a35e031e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a35e031e
Branch: refs/heads/camel-2.14.x
Commit: a35e031eff7eaad5a72197abc646ed3c97ea46fa
Parents: 076bb85
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Jan 4 14:03:15 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Jan 4 14:12:09 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/jms/JmsProducer.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a35e031e/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
index a30c4f3..0ad2949 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
@@ -232,9 +232,6 @@ public class JmsProducer extends DefaultAsyncProducer {
doSend(true, destinationName, destination, messageCreator, messageSentCallback);
- // after sending then set the OUT message id to the JMSMessageID so its identical
- setMessageId(exchange);
-
// continue routing asynchronously (reply will be processed async when its received)
return false;
}
[4/4] camel git commit: CAMEL-8194: Allow camel-elasticsearch to work
in an OSGi environment
Posted by ni...@apache.org.
CAMEL-8194: Allow camel-elasticsearch to work in an OSGi environment
Conflicts:
components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35d26ca7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35d26ca7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35d26ca7
Branch: refs/heads/camel-2.13.x
Commit: 35d26ca72081c51bd4d4c2c06102f0378656c662
Parents: 5832b06
Author: Derek Abdine <da...@rapid7.com>
Authored: Fri Jan 2 10:01:11 2015 -0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Jan 4 14:54:39 2015 +0800
----------------------------------------------------------------------
.../camel/component/elasticsearch/ElasticsearchEndpoint.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/35d26ca7/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 1afc79e..3c935e9 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
@@ -71,6 +71,11 @@ public class ElasticsearchEndpoint extends DefaultEndpoint {
if (config.getIp() != null) {
LOG.info("REMOTE ELASTICSEARCH: {}", config.getIp());
Settings settings = ImmutableSettings.settingsBuilder()
+ // setting the classloader here will allow the underlying elasticsearch-java
+ // class to find its names.txt in an OSGi environment (otherwise the thread
+ // classloader is used, which won't be able to see the file causing a startup
+ // exception).
+ .classLoader(Settings.class.getClassLoader())
.put("cluster.name", config.getClusterName())
.put("client.transport.ignore_cluster_name", false)
.put("node.client", true)
[2/4] camel git commit: CAMEL-8200 Fix the issue of race condition in
JmsProducer for request/response messaging with thanks to Krzysztof
Posted by ni...@apache.org.
CAMEL-8200 Fix the issue of race condition in JmsProducer for request/response messaging with thanks to Krzysztof
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5832b06e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5832b06e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5832b06e
Branch: refs/heads/camel-2.13.x
Commit: 5832b06e7446b5719496068f826ff8eb1a1f697c
Parents: 3ca1a6d
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Jan 4 14:03:15 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Jan 4 14:12:16 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/jms/JmsProducer.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5832b06e/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
index a30c4f3..0ad2949 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
@@ -232,9 +232,6 @@ public class JmsProducer extends DefaultAsyncProducer {
doSend(true, destinationName, destination, messageCreator, messageSentCallback);
- // after sending then set the OUT message id to the JMSMessageID so its identical
- setMessageId(exchange);
-
// continue routing asynchronously (reply will be processed async when its received)
return false;
}
[3/4] camel git commit: CAMEL-8194: Allow camel-elasticsearch to work
in an OSGi environment
Posted by ni...@apache.org.
CAMEL-8194: Allow camel-elasticsearch to work in an OSGi environment
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7daa1907
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7daa1907
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7daa1907
Branch: refs/heads/camel-2.14.x
Commit: 7daa19071c197bcf34545530e24b81cab7fb7a57
Parents: a35e031
Author: Derek Abdine <da...@rapid7.com>
Authored: Fri Jan 2 10:01:11 2015 -0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Jan 4 14:49:08 2015 +0800
----------------------------------------------------------------------
.../camel/component/elasticsearch/ElasticsearchEndpoint.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7daa1907/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 d31ed30..108ce01 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
@@ -75,6 +75,11 @@ public class ElasticsearchEndpoint extends DefaultEndpoint {
if (configuration.getIp() != null) {
LOG.info("REMOTE ELASTICSEARCH: {}", configuration.getIp());
Settings settings = ImmutableSettings.settingsBuilder()
+ // setting the classloader here will allow the underlying elasticsearch-java
+ // class to find its names.txt in an OSGi environment (otherwise the thread
+ // classloader is used, which won't be able to see the file causing a startup
+ // exception).
+ .classLoader(Settings.class.getClassLoader())
.put("cluster.name", configuration.getClusterName())
.put("client.transport.ignore_cluster_name", false)
.put("node.client", true)