camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r749631 - in /camel/branches/camel-1.x: ./ components/camel-jms/src/main/java/org/apache/camel/component/jms/ components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/
Date Tue, 03 Mar 2009 15:31:01 GMT
Author: ningjiang
Date: Tue Mar  3 15:30:58 2009
New Revision: 749631

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

........
  r749628 | ningjiang | 2009-03-03 23:18:21 +0800 (Tue, 03 Mar 2009) | 1 line
  
  CAMEL-1414 Applied patch with thanks to Nicolas, also fixed the same issue in camel-spring-integration
........
  r749629 | ningjiang | 2009-03-03 23:20:28 +0800 (Tue, 03 Mar 2009) | 1 line
  
  CAMEL-1414 Fixed the same issue in camel-spring-integration
........

Modified:
    camel/branches/camel-1.x/   (props changed)
    camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
    camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  3 15:30:58 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
+/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

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/JmsMessage.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=749631&r1=749630&r2=749631&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++ camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Tue Mar  3 15:30:58 2009
@@ -77,6 +77,7 @@
         }
         setBody(that.getBody());
         getHeaders().putAll(that.getHeaders());
+        getAttachments().putAll(that.getAttachments());
     }
 
     /**

Modified: camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=749631&r1=749630&r2=749631&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
(original)
+++ camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
Tue Mar  3 15:30:58 2009
@@ -56,6 +56,7 @@
             SpringIntegrationMessage orig = (SpringIntegrationMessage) that;
             setMessage(orig.getMessage());
         }
+        getAttachments().putAll(that.getAttachments());
     }
 
     @Override



Mime
View raw message