Author: ningjiang
Date: Tue Feb 21 15:33:27 2012
New Revision: 1291871
URL: http://svn.apache.org/viewvc?rev=1291871&view=rev
Log:
Merged revisions 1291848 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1291848 | ningjiang | 2012-02-21 23:12:12 +0800 (Tue, 21 Feb 2012) | 1 line
CAMEL-5024 Fixed the issue of Streaming splitter ignores exception handling
........
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
- copied unchanged from r1291848,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 21 15:33:27 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1291871&r1=1291870&r2=1291871&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Tue Feb 21 15:33:27 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