Repository: camel Updated Branches: refs/heads/camel-2.17.x d0b0e420f -> ef6d33803
Revert "CAMEL-10195: rest-dsl - automatic binding failure with waitForTaskToComplete=Never" This reverts commit 9fedf6aa6ae5a55ed02920d63cd888dbb8b42934. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef6d3380 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef6d3380 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef6d3380 Branch: refs/heads/camel-2.17.x Commit: ef6d33803810e2c1af22243f8acaf6459e7185ba Parents: d0b0e42 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 3 18:15:03 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 3 18:15:03 2016 +0200 ---------------------------------------------------------------------- .../camel/component/seda/SedaProducer.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ef6d3380/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java index 3e34e8a..1e28eaa 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.seda; -import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -26,7 +25,6 @@ import org.apache.camel.Exchange; import org.apache.camel.ExchangeTimedOutException; import org.apache.camel.WaitForTaskToComplete; import org.apache.camel.impl.DefaultAsyncProducer; -import org.apache.camel.spi.Synchronization; import org.apache.camel.support.SynchronizationAdapter; import org.apache.camel.util.ExchangeHelper; @@ -180,23 +178,7 @@ public class SedaProducer extends DefaultAsyncProducer { protected Exchange prepareCopy(Exchange exchange, boolean handover) { // use a new copy of the exchange to route async (and use same message id) - Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, false, true); - // if handover we need to do special handover to avoid handing over - // RestBindingMarshalOnCompletion as it should not be handed over with SEDA - if (handover) { - List<Synchronization> completions = exchange.handoverCompletions(); - if (completions != null) { - for (Synchronization sync : completions) { - if (sync.getClass().getName().contains("RestBindingMarshalOnCompletion")) { - // keep this one - exchange.addOnCompletion(sync); - } else { - // handover - copy.addOnCompletion(sync); - } - } - } - } + Exchange copy = ExchangeHelper.createCorrelatedCopy(exchange, handover, true); // set a new from endpoint to be the seda queue copy.setFromEndpoint(endpoint); return copy;
