CAMEL-11283: camel-hystrix-starter - The circuitBreakerForceClose option is default true which should be false
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c30e1606 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c30e1606 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c30e1606 Branch: refs/heads/master Commit: c30e16064ed90e715634b6491a211f90add727f1 Parents: 74eaa52 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue May 16 11:35:49 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue May 16 12:28:00 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/model/HystrixConfigurationCommon.java | 2 +- .../camel/component/hystrix/processor/HystrixProcessorFactory.java | 1 + .../model/springboot/HystrixConfigurationDefinitionCommon.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c30e1606/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java index ec5bac0..caf8ff5 100644 --- a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java +++ b/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java @@ -40,7 +40,7 @@ public class HystrixConfigurationCommon extends IdentifiedType { @Metadata(label = "command", defaultValue = "50") private Integer circuitBreakerErrorThresholdPercentage; @XmlAttribute - @Metadata(label = "command", defaultValue = "true") + @Metadata(label = "command", defaultValue = "false") private Boolean circuitBreakerForceClosed; @XmlAttribute @Metadata(label = "command", defaultValue = "false") http://git-wip-us.apache.org/repos/asf/camel/blob/c30e1606/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java index 909f6da..b6de943 100644 --- a/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java +++ b/components/camel-hystrix/src/main/java/org/apache/camel/component/hystrix/processor/HystrixProcessorFactory.java @@ -42,6 +42,7 @@ import static org.apache.camel.util.CamelContextHelper.mandatoryLookup; * To integrate camel-hystrix with the Camel routes using the Hystrix EIP. */ public class HystrixProcessorFactory extends TypedProcessorFactory<HystrixDefinition> { + public HystrixProcessorFactory() { super(HystrixDefinition.class); } http://git-wip-us.apache.org/repos/asf/camel/blob/c30e1606/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java index acf095b..ee65254 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java @@ -58,7 +58,7 @@ public class HystrixConfigurationDefinitionCommon { * property takes precedence so if it set to true this property does * nothing. */ - private Boolean circuitBreakerForceClosed = true; + private Boolean circuitBreakerForceClosed = false; /** * If true the HystrixCircuitBreaker.allowRequest() will always return false * causing the circuit to be open (tripped) and reject all requests. This
