You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/07/10 16:10:27 UTC
[5/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on
callback for sync case which was missing.
CAMEL-6537: Fixed RoutingSlip EIP to call done on callback for sync case which was missing.
Conflicts:
camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e8605951
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8605951
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8605951
Branch: refs/heads/camel-2.11.x
Commit: e860595124f2f8c1a6abc5cc1e4c83fac3939e80
Parents: 305aac7
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 10 16:07:53 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 10 16:09:21 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/RoutingSlip.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e8605951/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
index da638ad..5a50f4e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -284,10 +284,11 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
exchange.setProperty(Exchange.TO_ENDPOINT, endpoint.getEndpointUri());
exchange.setProperty(Exchange.SLIP_ENDPOINT, endpoint.getEndpointUri());
- boolean sync = AsyncProcessorHelper.process(asyncProducer, exchange, new AsyncCallback() {
+ return AsyncProcessorHelper.process(asyncProducer, exchange, new AsyncCallback() {
public void done(boolean doneSync) {
// we only have to handle async completion of the routing slip
if (doneSync) {
+ callback.done(doneSync);
return;
}
@@ -347,9 +348,6 @@ public class RoutingSlip extends ServiceSupport implements AsyncProcessor, Trace
callback.done(false);
}
});
-
- callback.done(sync);
- return sync;
}
});