[7/7] git commit: CAMEL-6537: Fixed RoutingSlip EIP to call done on callback for sync case which was missing.

[davsclaus]

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/6eb5ff0f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6eb5ff0f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6eb5ff0f

Branch: refs/heads/camel-2.10.x
Commit: 6eb5ff0f32193e21e9331c0afce9ab96b442f56c
Parents: 64520c3
Author: Claus Ibsen <davscl...@apache.org>
Authored: Wed Jul 10 16:07:53 2013 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Wed Jul 10 16:10:02 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/6eb5ff0f/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;
             }
         });