You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ch...@apache.org on 2007/11/09 15:32:08 UTC

svn commit: r593539 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/processor/Pipeline.java test/java/org/apache/camel/processor/PipelineTest.java

Author: chirino
Date: Fri Nov  9 06:32:08 2007
New Revision: 593539

URL: http://svn.apache.org/viewvc?rev=593539&view=rev
Log:
Applying patch: https://issues.apache.org/activemq/browse/camel-210
Fix for exception clause doesn't proceed with pipeline
Thx Roman!

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?rev=593539&r1=593538&r2=593539&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java Fri Nov  9 06:32:08 2007
@@ -149,7 +149,7 @@
         // previous message if it is not null
         Message previousOut = previousExchange.getOut(false);
         Message in = answer.getIn();
-        if (previousOut != null && previousOut.getBody() != null) {
+        if (previousOut != null) {
             in.copyFrom(previousOut);
         }
         else {

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java?rev=593539&r1=593538&r2=593539&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java Fri Nov  9 06:32:08 2007
@@ -110,6 +110,17 @@
         assertEquals(1, exchange.getOut().getHeader("copy-counter"));                
     }
 
+    public void testOnlyProperties() {
+        Exchange exchange = template.send("direct:b", new Processor() {
+            public void process(Exchange exchange) {
+                exchange.getIn().setHeader("header", "headerValue");
+            }
+        });
+        
+        assertEquals("headerValue", exchange.getOut().getHeader("header"));
+        assertEquals(3, exchange.getOut().getHeader("copy-counter"));  
+    }
+    
     @Override
     protected void setUp() throws Exception {
         super.setUp();