Author: ningjiang Date: Tue Feb 21 15:41:30 2012 New Revision: 1291880 URL: http://svn.apache.org/viewvc?rev=1291880&view=rev Log: Merged revisions 1291871 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1291871 | ningjiang | 2012-02-21 23:33:27 +0800 (Tue, 21 Feb 2012) | 9 lines 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.8.x/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java - copied unchanged from r1291871, camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingWithErrorHandlerTest.java Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 21 15:41:30 2012 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877 -/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872 +/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877,1291871 +/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872,1291848 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1291880&r1=1291879&r2=1291880&view=diff ============================================================================== --- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original) +++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Tue Feb 21 15:41:30 2012 @@ -208,7 +208,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
