Author: davsclaus
Date: Wed Jun 20 07:55:19 2012
New Revision: 1351973
URL: http://svn.apache.org/viewvc?rev=1351973&view=rev
Log:
CAMEL-5381: Fixed headers not propagated, due copyFrom should check if trying
to copy itself.
Added:
camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
- copied unchanged from r1351972,
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1351972
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1351973&r1=1351972&r2=1351973&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Wed Jun 20 07:55:19 2012
@@ -61,6 +61,11 @@ public class JmsMessage 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();
