Author: davsclaus
Date: Wed Jun 20 14:04:01 2012
New Revision: 1352112
URL: http://svn.apache.org/viewvc?rev=1352112&view=rev
Log:
CAMEL-5381: Fixed headers not propagated, due copyFrom should check if trying
to copy itself.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1352108
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.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-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=1352112&r1=1352111&r2=1352112&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
Wed Jun 20 14:04:01 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());
