Repository: camel Updated Branches: refs/heads/camel-2.18.x 1515c55b5 -> 36e481749 refs/heads/master 598272590 -> 7786676d6
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/7786676d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7786676d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7786676d Branch: refs/heads/master Commit: 7786676d6d5ecc3f85ccc1c9c5d8b578de216e1e Parents: 5982725 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 29 10:13:57 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 29 10:13:57 2016 +0100 ---------------------------------------------------------------------- .../camel/component/hystrix/processor/HystrixProcessorCommand.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7786676d/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);
