This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ff4dada99e09bc32986d4ba33a84b767402cef4 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed May 29 08:24:41 2019 +0200 Fixed CS for Camel-base --- .../main/java/org/apache/camel/impl/engine/DefaultRouteContext.java | 3 +-- .../org/apache/camel/processor/errorhandler/ExceptionPolicy.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java index 14628e3..74aea37 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultRouteContext.java @@ -76,6 +76,7 @@ public class DefaultRouteContext implements RouteContext { private final Map<String, Object> properties = new HashMap<>(); private ErrorHandlerFactory errorHandlerFactory; private Integer startupOrder; + private Map<ErrorHandlerFactory, Set<NamedNode>> errorHandlers = new HashMap<>(); public DefaultRouteContext(CamelContext camelContext, NamedNode route, String routeId) { this.camelContext = camelContext; @@ -467,8 +468,6 @@ public class DefaultRouteContext implements RouteContext { properties.put(key, value); } - private Map<ErrorHandlerFactory, Set<NamedNode>> errorHandlers = new HashMap<>(); - @Override public void addErrorHandler(ErrorHandlerFactory factory, NamedNode onException) { getErrorHandlers(factory).add(onException); diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java index cbfdc4a..84766cc 100644 --- a/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java +++ b/core/camel-base/src/main/java/org/apache/camel/processor/errorhandler/ExceptionPolicy.java @@ -43,7 +43,10 @@ public class ExceptionPolicy { private Map<RedeliveryOption, String> redeliveryPolicy; private List<String> exceptions; - public ExceptionPolicy(String id, String routeId, boolean useOriginalInMessage, boolean hasOutputs, Predicate handledPolicy, Predicate continuedPolicy, Predicate retryWhilePolicy, Processor onRedelivery, Processor onExceptionOccurred, String redeliveryPolicyRef, Map<RedeliveryOption, String> redeliveryPolicy, List<String> exceptions) { + public ExceptionPolicy(String id, String routeId, boolean useOriginalInMessage, + boolean hasOutputs, Predicate handledPolicy, Predicate continuedPolicy, + Predicate retryWhilePolicy, Processor onRedelivery, Processor onExceptionOccurred, + String redeliveryPolicyRef, Map<RedeliveryOption, String> redeliveryPolicy, List<String> exceptions) { this.id = id; this.routeId = routeId; this.useOriginalInMessage = useOriginalInMessage;