| commit | 984e9942dcbe853f97d3344d74e76d167ac5df1e | [log] [tgz] |
|---|---|---|
| author | Gert Vanthienen <gertv@apache.org> | Wed Jun 26 12:10:20 2013 +0000 |
| committer | Gert Vanthienen <gertv@apache.org> | Wed Jun 26 12:10:20 2013 +0000 |
| tree | 07ba1b884b9ad6cf9bf50e3c64163612fb86e41b | |
| parent | 7f58af69338ccb1204ea125f581e9052df6e1b44 [diff] |
SMX4-1486: Upgrade to Camel 2.10.5 git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/features/trunk@1496898 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java index 2d41530..ccb5848 100644 --- a/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java +++ b/camel/servicemix-camel/src/main/java/org/apache/servicemix/camel/nmr/ServiceMixConsumer.java
@@ -77,8 +77,7 @@ camelExchange.addOnCompletion(this); if (getEndpoint().isSynchronous()) { getProcessor().process(camelExchange); - // need to send the response back here - onComplete(camelExchange); + // no need to send the response back here, this is handled by the onComplete/onFailure method } else { getAsyncProcessor().process(camelExchange, new AsyncCallback() { public void done(boolean doneSync) {
diff --git a/parent/pom.xml b/parent/pom.xml index 57d2450..faccd7e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml
@@ -39,7 +39,7 @@ <properties> <activemq.version>5.7.0</activemq.version> <activiti.version>5.10</activiti.version> - <camel.version>2.10.4</camel.version> + <camel.version>2.10.5</camel.version> <cxf.version>2.6.6</cxf.version> <cxf.features.version>2.6.6.1</cxf.features.version> <felix.obr.version>1.6.4</felix.obr.version>