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 2012/11/07 11:00:49 UTC
svn commit: r1406515 - in /camel/branches/camel-2.10.x: ./
components/camel-jms/src/main/java/org/apache/camel/component/jms/
components/camel-jms/src/test/java/org/apache/camel/component/jms/
Author: davsclaus
Date: Wed Nov 7 10:00:48 2012
New Revision: 1406515
URL: http://svn.apache.org/viewvc?rev=1406515&view=rev
Log:
CAMEL-5464 fix the issue that camel-jms consumer doesn't send back a reply in all cases
Added:
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutWithNoOutBodyTest.java
- copied unchanged from r1379354, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutWithNoOutBodyTest.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1379354
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=1406515&r1=1406514&r2=1406515&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Wed Nov 7 10:00:48 2012
@@ -193,8 +193,13 @@ public class EndpointMessageListener imp
}
} else {
// process OK so get the reply body if we are InOut and has a body
- if (sendReply && exchange.getPattern().isOutCapable() && exchange.hasOut()) {
- body = exchange.getOut();
+ // If the ppl don't want to send the message back, he should use the InOnly
+ if (sendReply && exchange.getPattern().isOutCapable()) {
+ if (exchange.hasOut()) {
+ body = exchange.getOut();
+ } else {
+ body = exchange.getIn();
+ }
cause = null;
}
}
Modified: camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java?rev=1406515&r1=1406514&r2=1406515&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java Wed Nov 7 10:00:48 2012
@@ -31,6 +31,7 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -74,11 +75,13 @@ public class JmsRouteRequestReplyTest ex
public static class SingleNodeDeadEndRouteBuilder extends RouteBuilder {
public void configure() throws Exception {
- from(endpointUriA).process(new Processor() {
- public void process(Exchange e) {
- // do nothing
- }
- });
+ from(endpointUriA)
+ // We are not expect the response here
+ .setExchangePattern(ExchangePattern.InOnly).process(new Processor() {
+ public void process(Exchange e) {
+ // do nothing
+ }
+ });
}
};