Repository: camel Updated Branches: refs/heads/master 043065a9c -> e84b2c0f6
Reduce length of stacktraces Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6c7d5967 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6c7d5967 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6c7d5967 Branch: refs/heads/master Commit: 6c7d596782694a103bc321a343f70fe5358e159d Parents: 043065a Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 3 11:45:06 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 3 11:45:06 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/processor/DeadLetterChannel.java | 5 ----- .../org/apache/camel/processor/DefaultErrorHandler.java | 10 ---------- .../org/apache/camel/processor/LoggingErrorHandler.java | 5 ++++- 3 files changed, 4 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6c7d5967/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java b/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java index d6e44b6..03fe8d4 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java +++ b/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java @@ -63,11 +63,6 @@ public class DeadLetterChannel extends RedeliveryErrorHandler { setExceptionPolicy(exceptionPolicyStrategy); } - public void process(Exchange exchange) throws Exception { - // just to let the stack trace reveal that this is a dead letter channel - super.process(exchange); - } - @Override public String toString() { if (output == null) { http://git-wip-us.apache.org/repos/asf/camel/blob/6c7d5967/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java index 185a610..3f3bc8c 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java +++ b/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java @@ -19,7 +19,6 @@ package org.apache.camel.processor; import java.util.concurrent.ScheduledExecutorService; import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; @@ -55,11 +54,6 @@ public class DefaultErrorHandler extends RedeliveryErrorHandler { setExceptionPolicy(exceptionPolicyStrategy); } - public void process(Exchange exchange) throws Exception { - // just to let the stacktrace reveal that this is a default error handler - super.process(exchange); - } - @Override public String toString() { if (output == null) { @@ -69,8 +63,4 @@ public class DefaultErrorHandler extends RedeliveryErrorHandler { return "DefaultErrorHandler[" + output + "]"; } - public Processor getDeadLetterProcessor() { - return deadLetter; - } - } http://git-wip-us.apache.org/repos/asf/camel/blob/6c7d5967/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java b/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java index 218da95..36166b4 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java +++ b/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java @@ -20,12 +20,15 @@ import org.apache.camel.CamelContext; import org.apache.camel.Processor; import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy; import org.apache.camel.util.CamelLogger; +import org.springframework.context.annotation.DependsOn; /** * An {@link ErrorHandler} which uses commons-logging to dump the error * - * @version + * @version + * @deprecated use {@link DeadLetterChannel} using a log endpoint instead */ +@DependsOn public class LoggingErrorHandler extends DefaultErrorHandler { /**
