Repository: camel Updated Branches: refs/heads/master 869de0d21 -> e97a7c11a
CAMEL-7999: Corrected default values for Camel model Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e97a7c11 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e97a7c11 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e97a7c11 Branch: refs/heads/master Commit: e97a7c11a2aaa1a5cdb00ed32ba30f0425b44b51 Parents: 869de0d Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Feb 1 10:32:33 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Feb 1 10:32:33 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/model/BeanDefinition.java | 2 +- .../main/java/org/apache/camel/model/RecipientListDefinition.java | 2 +- .../camel/processor/loadbalancer/CircuitBreakerLoadBalancer.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e97a7c11/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java index d97fb0c..b1e77e8 100644 --- a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java @@ -51,7 +51,7 @@ public class BeanDefinition extends NoOutputDefinition<BeanDefinition> { private String method; @XmlAttribute private String beanType; - @XmlAttribute + @XmlAttribute @Metadata(defaultValue = "true") private Boolean cache; @XmlAttribute @Deprecated http://git-wip-us.apache.org/repos/asf/camel/blob/e97a7c11/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java index 6f193e2..c983cf3 100644 --- a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java @@ -52,7 +52,7 @@ public class RecipientListDefinition<Type extends ProcessorDefinition<Type>> ext private AggregationStrategy aggregationStrategy; @XmlTransient private ExecutorService executorService; - @XmlAttribute + @XmlAttribute @Metadata(defaultValue = ",") private String delimiter; @XmlAttribute private Boolean parallelProcessing; http://git-wip-us.apache.org/repos/asf/camel/blob/e97a7c11/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/CircuitBreakerLoadBalancer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/CircuitBreakerLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/CircuitBreakerLoadBalancer.java index f3f82d5..f760311 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/CircuitBreakerLoadBalancer.java +++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/CircuitBreakerLoadBalancer.java @@ -143,7 +143,6 @@ public class CircuitBreakerLoadBalancer extends LoadBalancerSupport implements T } private boolean openCircuit(final Exchange exchange, final AsyncCallback callback) { - boolean output = rejectExchange(exchange, callback); state.set(STATE_OPEN); logState();
