svn commit: r1331928 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/MulticastProcessor.java test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java

[da...@apache.org]

Author: davsclaus
Date: Sun Apr 29 15:52:46 2012
New Revision: 1331928

URL: http://svn.apache.org/viewvc?rev=1331928&view=rev
Log:
CAMEL-5193: Fixed WARN logging about cannot determine current route id

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.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=1331928&r1=1331927&r2=1331928&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 Sun Apr 29 15:52:46 2012
@@ -867,15 +867,16 @@ public class MulticastProcessor extends 
             // instead of using ProcessorDefinition.wrapInErrorHandler)
             try {
                 processor = builder.createErrorHandler(routeContext, processor);
+
+                // and wrap in unit of work processor so the copy exchange also can run under UoW
+                answer = createUnitOfWorkProcessor(routeContext, processor, exchange);
+
                 // must start the error handler
-                ServiceHelper.startServices(processor);
+                ServiceHelper.startServices(answer);
             } catch (Exception e) {
                 throw ObjectHelper.wrapRuntimeCamelException(e);
             }
 
-            // and wrap in unit of work processor so the copy exchange also can run under UoW
-            answer = createUnitOfWorkProcessor(routeContext, processor, exchange);
-
             // add to cache
             errorHandlers.putIfAbsent(key, answer);
         } else {

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java?rev=1331928&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java Sun Apr 29 15:52:46 2012
@@ -0,0 +1,58 @@
+/**
+ * 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class SingleOutputInMulticastIssueTest extends ContextTestSupport {
+
+    public void testSingleOutputInMulticastIssue() throws Exception {
+        getMockEndpoint("mock:error").expectedMessageCount(1);
+        getMockEndpoint("mock:auit").expectedMessageCount(0);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                onException(Exception.class)
+                        .handled(true)
+                        .to("mock:error")
+                        .end();
+
+                from("direct:start")
+                    .routeId("foo")
+                    .multicast().stopOnException()
+                        .to("direct:fail", "mock:audit")
+                    .end();
+
+                from("direct:fail")
+                    .routeId("fail")
+                    .throwException(new IllegalAccessException("Forced"));
+            }
+        };
+    }
+}