camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r762050 - in /camel/branches/camel-1.x: ./ components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
Date Sun, 05 Apr 2009 07:12:31 GMT
Author: davsclaus
Date: Sun Apr  5 07:12:30 2009
New Revision: 762050

URL: http://svn.apache.org/viewvc?rev=762050&view=rev
Log:
Merged revisions 762047 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r762047 | davsclaus | 2009-04-05 08:52:46 +0200 (Sun, 05 Apr 2009) | 1 line
  
  CAMEL-1461: Applied patch with thanks to Marat, for patiently explaining the issue and providing
this great patch.
........

Added:
    camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
      - copied unchanged from r762047, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr  5 07:12:30 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=762050&r1=762049&r2=762050&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
(original)
+++ camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
Sun Apr  5 07:12:30 2009
@@ -233,7 +233,6 @@
                 String to = endpoint.getDestination();
                 LOG.warn("Disabling JMSReplyTo as this Exchange is not OUT capable: " + exchange
+ " with destination: " + to);
                 exchange.getIn().setHeader("JMSReplyTo", null);
-                exchange.getIn().setHeader("JMSCorrelationID", null);
             }
 
             getInOnlyTemplate().send(endpoint.getDestination(), new MessageCreator() {



Mime
View raw message