svn commit: r1291848 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/MulticastProcessor.java test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java

[ni...@apache.org]

Author: ningjiang
Date: Tue Feb 21 15:12:12 2012
New Revision: 1291848

URL: http://svn.apache.org/viewvc?rev=1291848&view=rev
Log:
CAMEL-5024 Fixed the issue of Streaming splitter ignores exception handling

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1291848&r1=1291847&r2=1291848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Tue Feb 21 15:12:12 2012
@@ -209,7 +209,8 @@ public class MulticastProcessor extends 
 
             // after we have created the processors we consider the exchange as exhausted if an unhandled
             // exception was thrown, (used in the catch block)
-            exhaust = true;
+            // if the processors is working in Streaming model, the exchange could not be processed at this point.
+            exhaust = !isStreaming();
 
             if (isParallelProcessing()) {
                 // ensure an executor is set when running in parallel

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java?rev=1291848&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java Tue Feb 21 15:12:12 2012
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.util.Iterator;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class SplitterStreamingWithErrorHandlerTest extends ContextTestSupport {
+
+    public void testSplitterStreamingWithError() throws Exception {
+        getMockEndpoint("mock:b").expectedMessageCount(0);
+        getMockEndpoint("mock:error").expectedMessageCount(1);
+
+        // we do not stop on exception and thus the splitted message which
+        // failed
+        // would be silently ignored so we can continue routing
+        // you can always use a custom aggregation strategy to deal with errors
+        // your-self
+        template.sendBody("direct:start", new Iterator<String>() {
+
+            @Override
+            public void remove() {
+            }
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public String next() {
+                throw new RuntimeException("Uhoh.");
+            }
+
+        });
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                errorHandler(deadLetterChannel("mock:error"));
+                from("direct:start").split(body()).streaming().to("mock:b").end();
+            }
+        };
+    }
+}