Author: davsclaus
Date: Fri Apr 27 07:56:05 2012
New Revision: 1331278

URL: http://svn.apache.org/viewvc?rev=1331278&view=rev
Log:
CAMEL-5210: Fixed NPE with loop copy and error occurred.

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.java
      - copied, changed from r1331237, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyTest.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java?rev=1331278&r1=1331277&r2=1331278&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
 Fri Apr 27 07:56:05 2012
@@ -150,8 +150,8 @@ public class LoopProcessor extends Deleg
      */
     protected Exchange prepareExchange(Exchange exchange, int index) {
         if (copy) {
-            // create a correlated copy, and do not handover completions on 
copies
-            return ExchangeHelper.createCorrelatedCopy(exchange, false);
+            // use a copy but let it reuse the same exchange id so it appear 
as one exchange
+            return ExchangeHelper.createCopy(exchange, true);
         } else {
             ExchangeHelper.prepareOutToIn(exchange);
             return exchange;

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.java
 (from r1331237, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyTest.java&r1=1331237&r2=1331278&rev=1331278&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.java
 Fri Apr 27 07:56:05 2012
@@ -17,18 +17,25 @@
 package org.apache.camel.processor;
 
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 
 /**
  * @version 
  */
-public class LoopCopyTest extends ContextTestSupport {
+public class LoopCopyErrorTest extends ContextTestSupport {
 
     public void testLoopCopy() throws Exception {
-        getMockEndpoint("mock:loop").expectedBodiesReceived("AB", "AB", "AB");
-        getMockEndpoint("mock:result").expectedBodiesReceived("AB");
+        getMockEndpoint("mock:loop").expectedMessageCount(2);
+        getMockEndpoint("mock:result").expectedMessageCount(0);
 
-        template.sendBody("direct:start", "A");
+        try {
+            template.sendBody("direct:start", "A");
+            fail("Should have thrown exception");
+        } catch (Exception e) {
+            assertEquals("Forced", e.getCause().getMessage());
+        }
 
         assertMockEndpointsSatisfied();
     }
@@ -38,16 +45,20 @@ public class LoopCopyTest extends Contex
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                // START SNIPPET: e1
                 from("direct:start")
-                    // instruct loop to use copy mode, which mean it will use 
a copy of the input exchange
-                    // for each loop iteration, instead of keep using the same 
exchange all over
                     .loop(3).copy()
-                        .transform(body().append("B"))
+                        .process(new Processor() {
+                            int invoked;
+                            @Override
+                            public void process(Exchange exchange) throws 
Exception {
+                                if (invoked++ > 1) {
+                                    throw new 
IllegalArgumentException("Forced");
+                                }
+                            }
+                        })
                         .to("mock:loop")
                     .end()
                     .to("mock:result");
-                // END SNIPPET: e1
             }
         };
     }


Reply via email to