You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/17 06:01:54 UTC

svn commit: r1232307 - in /camel/branches/camel-2.9.x/camel-core/src: main/java/org/apache/camel/processor/Splitter.java test/java/org/apache/camel/builder/ExpressionClauseTest.java

Author: hadrian
Date: Tue Jan 17 05:01:53 2012
New Revision: 1232307

URL: http://svn.apache.org/viewvc?rev=1232307&view=rev
Log:
CAMEL-4603. Do not propagate attachments on split messages.

Modified:
    camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
    camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java

Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?rev=1232307&r1=1232306&r2=1232307&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/Splitter.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/Splitter.java Tue Jan 17 05:01:53 2012
@@ -126,7 +126,7 @@ public class Splitter extends MulticastP
         return new Iterable() {
             // create a copy which we use as master to copy during splitting
             // this avoids any side effect reflected upon the incoming exchange
-            private final Exchange copy = ExchangeHelper.createCopy(exchange, true);
+            private final Exchange copy = copyExchangeNoAttachments(exchange, true);
             private final RouteContext routeContext = exchange.getUnitOfWork() != null ? exchange.getUnitOfWork().getRouteContext() : null;
 
             public Iterator iterator() {
@@ -221,4 +221,10 @@ public class Splitter extends MulticastP
     public Expression getExpression() {
         return expression;
     }
+    
+    static private Exchange copyExchangeNoAttachments(Exchange exchange, boolean preserveExchangeId) {
+        Exchange answer = ExchangeHelper.createCopy(exchange, preserveExchangeId);
+        answer.getIn().setAttachments(null);
+        return answer;
+    }
 }

Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java?rev=1232307&r1=1232306&r2=1232307&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java Tue Jan 17 05:01:53 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.builder;
 
+import java.util.Map;
+
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
@@ -28,6 +30,7 @@ import org.apache.camel.Processor;
 import org.apache.camel.component.bean.pojomessage.Person;
 import org.apache.camel.component.bean.pojomessage.PojoProxyHelperRequestReplyTest.PersonHandler;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.ObjectHelper;
 
 /**
  * @version 
@@ -60,6 +63,8 @@ public class ExpressionClauseTest extend
         });
 
         assertMockEndpointsSatisfied();
+        Map<String, DataHandler> attachments = mock.getExchanges().get(0).getIn().getAttachments();
+        assertTrue(attachments == null || attachments.size() == 0);
     }
 
     @Override