This is an automated email from the ASF dual-hosted git repository. valdar pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push: new d458cc9 CAMEL-13541 - Fixed CS d458cc9 is described below commit d458cc9e97019fa266cbacae59edb9c8a8baa437 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon May 20 08:58:39 2019 +0200 CAMEL-13541 - Fixed CS --- .../camel/component/hystrix/processor/HystrixProcessorCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e2e58c8..9083eaa 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 @@ -119,7 +119,7 @@ public class HystrixProcessorCommand extends HystrixCommand { // if hystrix execution timeout is enabled and fallback is enabled and a timeout occurs // then a hystrix timer thread executes the fallback so we can stop run() execution - if(getProperties().executionTimeoutEnabled().get() + if (getProperties().executionTimeoutEnabled().get() && getProperties().fallbackEnabled().get() && isCommandTimedOut.get() == TimedOutStatus.TIMED_OUT) { LOG.debug("Exiting run command due to a hystrix execution timeout in processing exchange: {}", exchange);