[camel] branch master updated: Fixed resilience4j after property placeholder changes in core

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new d3e934a  Fixed resilience4j after property placeholder changes in core
d3e934a is described below

commit d3e934a0a61b981cf03d6f21f493e62b9ef7bc66
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Feb 13 05:58:27 2020 +0100

    Fixed resilience4j after property placeholder changes in core
---
 .../org/apache/camel/component/resilience4j/ResilienceReifier.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
 
b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
index ffbc8ae..b0bf8b6 100644
--- 
a/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
+++ 
b/components/camel-resilience4j/src/main/java/org/apache/camel/component/resilience4j/ResilienceReifier.java
@@ -112,7 +112,7 @@ public class ResilienceReifier extends 
ProcessorReifier<CircuitBreakerDefinition
     }
 
     private BulkheadConfig configureBulkHead(Resilience4jConfigurationCommon 
config) {
-        if (parseBoolean(config.getBulkheadEnabled(), true)) {
+        if (!parseBoolean(config.getBulkheadEnabled(), false)) {
             return null;
         }
 
@@ -127,7 +127,7 @@ public class ResilienceReifier extends 
ProcessorReifier<CircuitBreakerDefinition
     }
 
     private TimeLimiterConfig 
configureTimeLimiter(Resilience4jConfigurationCommon config) {
-        if (parseBoolean(config.getTimeoutEnabled(), true)) {
+        if (!parseBoolean(config.getTimeoutEnabled(), false)) {
             return null;
         }
 
@@ -142,7 +142,7 @@ public class ResilienceReifier extends 
ProcessorReifier<CircuitBreakerDefinition
     }
 
     private void configureTimeoutExecutorService(ResilienceProcessor 
processor, RouteContext routeContext, Resilience4jConfigurationCommon config) {
-        if (parseBoolean(config.getTimeoutEnabled(), true)) {
+        if (!parseBoolean(config.getTimeoutEnabled(), false)) {
             return;
         }