svn commit: r597589 - /activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java

[js...@apache.org]

Author: jstrachan
Date: Fri Nov 23 00:30:22 2007
New Revision: 597589

URL: http://svn.apache.org/viewvc?rev=597589&view=rev
Log:
applied patch for https://issues.apache.org/activemq/browse/CAMEL-212 with thanks

Modified:
    activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java

Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=597589&r1=597588&r2=597589&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Fri Nov 23 00:30:22 2007
@@ -60,9 +60,6 @@
             }
             Destination replyDestination = getReplyToDestination(message);
             final JmsExchange exchange = createExchange(message, replyDestination);
-            if (replyDestination != null) {
-                exchange.setPattern(ExchangePattern.InOut);
-            }
             if (eagerLoadingOfProperties) {
                 exchange.getIn().getHeaders();
             }
@@ -81,7 +78,7 @@
     public JmsExchange createExchange(Message message, Destination replyDestination) {
         JmsExchange exchange = new JmsExchange(endpoint.getContext(), endpoint.getExchangePattern(), getBinding(), message);
         // lets set to an InOut if we have some kind of reply-to destination
-        if (replyDestination != null) {
+        if (replyDestination != null && !disableReplyTo) {
             exchange.setProperty("org.apache.camel.jms.replyDestination", replyDestination);
             exchange.setPattern(ExchangePattern.InOut);
         }