Author: davsclaus
Date: Thu Feb 23 09:34:33 2012
New Revision: 1292725

URL: http://svn.apache.org/viewvc?rev=1292725&view=rev
Log:
CAMEL-5033: Seda producer in synced mode should not handover on completion 
tasks.

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteOnCompletionTest.java
      - copied, changed from r1292642, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java?rev=1292725&r1=1292724&r2=1292725&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
 Thu Feb 23 09:34:33 2012
@@ -58,12 +58,6 @@ public class SedaProducer extends Defaul
 
     @Override
     public boolean process(final Exchange exchange, final AsyncCallback 
callback) {
-        // use a new copy of the exchange to route async and handover the on 
completion to the new copy
-        // so its the new copy that performs the on completion callback when 
its done
-        Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, true);
-        // set a new from endpoint to be the seda queue
-        copy.setFromEndpoint(endpoint);
-
         WaitForTaskToComplete wait = waitForTaskToComplete;
         if (exchange.getProperty(Exchange.ASYNC_WAIT) != null) {
             wait = exchange.getProperty(Exchange.ASYNC_WAIT, 
WaitForTaskToComplete.class);
@@ -72,6 +66,9 @@ public class SedaProducer extends Defaul
         if (wait == WaitForTaskToComplete.Always
             || (wait == WaitForTaskToComplete.IfReplyExpected && 
ExchangeHelper.isOutCapable(exchange))) {
 
+            // do not handover the completion as we wait for the copy to 
complete, and copy its result back when it done
+            Exchange copy = prepareCopy(exchange, false);
+
             // latch that waits until we are complete
             final CountDownLatch latch = new CountDownLatch(1);
 
@@ -145,6 +142,8 @@ public class SedaProducer extends Defaul
             }
         } else {
             // no wait, eg its a InOnly then just add to queue and return
+            // handover the completion so its the copy which performs that, as 
we do not wait
+            Exchange copy = prepareCopy(exchange, true);
             log.trace("Adding Exchange to queue: {}", copy);
             addToQueue(copy);
         }
@@ -155,6 +154,14 @@ public class SedaProducer extends Defaul
         return true;
     }
 
+    protected Exchange prepareCopy(Exchange exchange, boolean handover) {
+        // use a new copy of the exchange to route async
+        Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, 
handover);
+        // set a new from endpoint to be the seda queue
+        copy.setFromEndpoint(endpoint);
+        return copy;
+    }
+
     @Override
     protected void doStart() throws Exception {
         super.doStart();

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteOnCompletionTest.java
 (from r1292642, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteOnCompletionTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteOnCompletionTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java&r1=1292642&r2=1292725&rev=1292725&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteOnCompletionTest.java
 Thu Feb 23 09:34:33 2012
@@ -16,40 +16,35 @@
  */
 package org.apache.camel.component.seda;
 
+import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.SynchronizationAdapter;
 
 /**
  * @version 
  */
-public class SedaWaitForTaskCompleteTest extends ContextTestSupport {
-
-    public void testInOut() throws Exception {
-        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
-
-        String out = template.requestBody("direct:start", "Hello World", 
String.class);
-        assertEquals("Bye World", out);
+public class SedaWaitForTaskCompleteOnCompletionTest extends 
ContextTestSupport {
+    
+    private static String done = "";
+
+    public void testAlways() throws Exception {
+        getMockEndpoint("mock:result").expectedMessageCount(0);
+
+        try {
+            template.sendBody("direct:start", "Hello World");
+            fail("Should have thrown an exception");
+        } catch (CamelExecutionException e) {
+            assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+            assertEquals("Forced", e.getCause().getMessage());
+        }
 
         assertMockEndpointsSatisfied();
-    }
-
-    public void testInOnly() throws Exception {
-        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
 
-        // we send an in only but we use Always to wait for it to complete
-        // and since the route changes the payload we can get the response 
anyway
-        Exchange out = template.send("direct:start", new Processor() {
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setBody("Hello World");
-                exchange.setPattern(ExchangePattern.InOnly);
-            }
-        });
-        assertEquals("Bye World", out.getIn().getBody());
-
-        assertMockEndpointsSatisfied();
+        // 3 + 1 C and A should be last
+        assertEquals("CCCCA", done);
     }
 
     @Override
@@ -57,9 +52,38 @@ public class SedaWaitForTaskCompleteTest
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                
from("direct:start").to("seda:foo?waitForTaskToComplete=Always");
+                
errorHandler(defaultErrorHandler().maximumRedeliveries(3).redeliveryDelay(0));
 
-                
from("seda:foo?waitForTaskToComplete=Always").transform(constant("Bye 
World")).to("mock:result");
+                from("direct:start")
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws 
Exception {
+                            exchange.addOnCompletion(new 
SynchronizationAdapter() {
+                                @Override
+                                public void onDone(Exchange exchange) {
+                                    done = done + "A";
+                                }
+                            });
+                        }
+                    })
+                    .to("seda:foo?waitForTaskToComplete=Always")
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws 
Exception {
+                            done = done + "B";
+                        }
+                    })
+                    .to("mock:result");
+
+                from("seda:foo")
+                    .errorHandler(noErrorHandler())
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws 
Exception {
+                            done = done + "C";
+                        }
+                    })
+                    .throwException(new IllegalArgumentException("Forced"));
             }
         };
     }

Added: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java?rev=1292725&view=auto
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
 (added)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerOnCompletionTest.java
 Thu Feb 23 09:34:33 2012
@@ -0,0 +1,91 @@
+/**
+ * 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.component.seda;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.SynchronizationAdapter;
+
+/**
+ * @version 
+ */
+public class SedaWaitForTaskNewerOnCompletionTest extends ContextTestSupport {
+
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private static String done = "";
+
+    public void testNever() throws Exception {
+        getMockEndpoint("mock:dead").expectedMessageCount(0);
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        latch.await(5, TimeUnit.SECONDS);
+        // B should be first because we do not wait
+        assertEquals("BCA", done);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(3).redeliveryDelay(0));
+
+                from("direct:start")
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws 
Exception {
+                            exchange.addOnCompletion(new 
SynchronizationAdapter() {
+                                @Override
+                                public void onDone(Exchange exchange) {
+                                    done = done + "A";
+                                    latch.countDown();
+                                }
+                            });
+                        }
+                    })
+                    .to("seda:foo?waitForTaskToComplete=Never")
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws 
Exception {
+                            done = done + "B";
+                        }
+                    })
+                    .to("mock:result");
+
+                from("seda:foo")
+                    .errorHandler(noErrorHandler())
+                    .delay(1000)
+                    .process(new Processor() {
+                        @Override
+                        public void process(Exchange exchange) throws 
Exception {
+                            done = done + "C";
+                        }
+                    })
+                    .throwException(new IllegalArgumentException("Forced"));
+            }
+        };
+    }
+}
\ No newline at end of file


Reply via email to