[camel] branch master updated: Fixed CS

[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 a39da85  Fixed CS
a39da85 is described below

commit a39da85467d6cadf071b18327635dc72079eeb45
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Nov 7 13:07:38 2020 +0100

    Fixed CS
---
 .../apache/camel/processor/errorhandler/ErrorHandlerSupport.java    | 5 +----
 .../org/apache/camel/processor/errorhandler/RedeliveryPolicy.java   | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.java
 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.java
index ee50e39..2bc8dbf 100644
--- 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.java
+++ 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupport.java
@@ -21,7 +21,6 @@ import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.spi.CamelLogger;
 import org.apache.camel.spi.ErrorHandler;
 import org.apache.camel.support.ChildServiceSupport;
 import org.apache.camel.support.processor.DefaultExchangeFormatter;
@@ -35,9 +34,7 @@ public abstract class ErrorHandlerSupport extends 
ChildServiceSupport implements
     // optimize to use a shared instance
     protected ExceptionPolicyStrategy exceptionPolicy = 
DefaultExceptionPolicyStrategy.INSTANCE;
     // optimize to use a shared instance
-    public static final CamelLogger DEFAULT_CAMEL_LOGGER = new CamelLogger();
-    // optimize to use a shared instance
-    public static final DefaultExchangeFormatter DEFAULT_EXCHANGE_FORMATTER = 
new DefaultExchangeFormatter();
+    protected static final DefaultExchangeFormatter DEFAULT_EXCHANGE_FORMATTER 
= new DefaultExchangeFormatter();
     static {
         DEFAULT_EXCHANGE_FORMATTER.setShowExchangeId(true);
         DEFAULT_EXCHANGE_FORMATTER.setMultiline(true);
diff --git 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
index de94f68..fd41bd0 100644
--- 
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
+++ 
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
@@ -79,13 +79,13 @@ import org.slf4j.LoggerFactory;
  * until attempt number 5 where it will use 5 seconds going forward.
  */
 public class RedeliveryPolicy implements Cloneable, Serializable {
+    // default policy using out of the box settings which can be shared
+    public static final RedeliveryPolicy DEFAULT_POLICY = new 
RedeliveryPolicy();
+
     protected static Random randomNumberGenerator;
     private static final long serialVersionUID = -338222777701473252L;
     private static final Logger LOG = 
LoggerFactory.getLogger(RedeliveryPolicy.class);
 
-    // default policy using out of the box settings which can be shared
-    public static final RedeliveryPolicy DEFAULT_POLICY = new 
RedeliveryPolicy();
-
     protected long redeliveryDelay = 1000L;
     protected int maximumRedeliveries;
     protected long maximumRedeliveryDelay = 60 * 1000L;