camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: CAMEL-10661: camel-hystrix - Fallback should route exchange if it was marked as stop due delay timeout
Date Thu, 29 Dec 2016 09:15:02 GMT
CAMEL-10661: camel-hystrix - Fallback should route exchange if it was marked as stop due delay
timeout


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/36e48174
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/36e48174
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/36e48174

Branch: refs/heads/camel-2.18.x
Commit: 36e481749d764a1d1e40e08c789e34bce5c9e946
Parents: 1515c55
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Dec 29 10:13:57 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Dec 29 10:14:32 2016 +0100

----------------------------------------------------------------------
 .../camel/component/hystrix/processor/HystrixProcessorCommand.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/36e48174/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
index 07157a5..4face6e 100644
--- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorCommand.java
@@ -61,6 +61,7 @@ public class HystrixProcessorCommand extends HystrixCommand {
             // give the rest of the pipeline another chance
             exchange.setProperty(Exchange.EXCEPTION_HANDLED, true);
             exchange.setProperty(Exchange.EXCEPTION_CAUGHT, exception);
+            exchange.removeProperty(Exchange.ROUTE_STOP);
             exchange.setException(null);
             // and we should not be regarded as exhausted as we are in a try .. catch block
             exchange.removeProperty(Exchange.REDELIVERY_EXHAUSTED);


Mime
View raw message