Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 57FCDE671 for ; Thu, 24 Jan 2013 14:32:59 +0000 (UTC) Received: (qmail 39141 invoked by uid 500); 24 Jan 2013 14:32:59 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 38950 invoked by uid 500); 24 Jan 2013 14:32:54 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 38922 invoked by uid 99); 24 Jan 2013 14:32:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 14:32:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 14:32:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 558D62388980; Thu, 24 Jan 2013 14:32:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1438017 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/test/java/org/apache/camel/processor/ components/camel-spring/src/test/resources/org/apache/camel/spring/processor/ Date: Thu, 24 Jan 2013 14:32:33 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130124143233.558D62388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Thu Jan 24 14:32:32 2013 New Revision: 1438017 URL: http://svn.apache.org/viewvc?rev=1438017&view=rev Log: CAMEL-6005 fixed the issue of using shareUnitOfWork within multicast Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastSubUnitOfWorkTest.java camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml 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=1438017&r1=1438016&r2=1438017&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 Thu Jan 24 14:32:32 2013 @@ -877,9 +877,12 @@ public class MulticastProcessor extends } catch (Exception e) { throw ObjectHelper.wrapRuntimeCamelException(e); } - - // add to cache - errorHandlers.putIfAbsent(key, answer); + // here we don't cache the ChildUnitOfWorkProcessor + // As the UnitOfWorkProcess will be delegate to the Parent + if (!(answer instanceof ChildUnitOfWorkProcessor)) { + // add to cache + errorHandlers.putIfAbsent(key, answer); + } } else { // and wrap in unit of work processor so the copy exchange also can run under UoW answer = createUnitOfWorkProcessor(routeContext, processor, exchange); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastSubUnitOfWorkTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastSubUnitOfWorkTest.java?rev=1438017&r1=1438016&r2=1438017&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastSubUnitOfWorkTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastSubUnitOfWorkTest.java Thu Jan 24 14:32:32 2013 @@ -58,6 +58,14 @@ public class MulticastSubUnitOfWorkTest assertEquals(4, counter); // 1 first + 3 redeliveries } + + public void testMulticastException() throws Exception { + getMockEndpoint("mock:dead").expectedBodiesReceived("Hello", "Hi", "Bye"); + template.sendBody("direct:e", "Hello"); + template.sendBody("direct:e", "Hi"); + template.sendBody("direct:e", "Bye"); + assertMockEndpointsSatisfied(); + } @Override protected RouteBuilder createRouteBuilder() throws Exception { @@ -82,6 +90,12 @@ public class MulticastSubUnitOfWorkTest from("direct:b") .process(new MyProcessor()) .to("mock:b"); + + from("direct:e") + .multicast().shareUnitOfWork() + .throwException(new IllegalArgumentException("exception1")) + .throwException(new IllegalArgumentException("exception2")) + .end(); } }; } Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml?rev=1438017&r1=1438016&r2=1438017&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml (original) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringMulticastSubUnitOfWorkTest.xml Thu Jan 24 14:32:32 2013 @@ -24,6 +24,7 @@ + @@ -57,6 +58,14 @@ + + + + + + + +