svn commit: r1352108 - in /camel/trunk/components: camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrMessage.java camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java

[davsclaus]

Author: davsclaus
Date: Wed Jun 20 14:01:18 2012
New Revision: 1352108

URL: http://svn.apache.org/viewvc?rev=1352108&view=rev
Log:
CAMEL-5381: Fixed headers not propagated, due copyFrom should check if trying 
to copy itself.

Modified:
    
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrMessage.java
    
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java

Modified: 
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrMessage.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrMessage.java?rev=1352108&r1=1352107&r2=1352108&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrMessage.java
 (original)
+++ 
camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrMessage.java
 Wed Jun 20 14:01:18 2012
@@ -50,6 +50,11 @@ public class JcrMessage extends DefaultM
 
     @Override
     public void copyFrom(org.apache.camel.Message that) {
+        if (that == this) {
+            // the same instance so do not need to copy
+            return;
+        }
+
         // must initialize headers before we set the JmsMessage to avoid Camel
         // populating it before we do the copy
         getHeaders().clear();

Modified: 
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=1352108&r1=1352107&r2=1352108&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
 (original)
+++ 
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
 Wed Jun 20 14:01:18 2012
@@ -46,6 +46,11 @@ public class SpringIntegrationMessage ex
 
     @Override
     public void copyFrom(org.apache.camel.Message that) {
+        if (that == this) {
+            // the same instance so do not need to copy
+            return;
+        }
+
         setMessageId(that.getMessageId());
         setBody(that.getBody());
         getHeaders().putAll(that.getHeaders());