Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e84b2c0f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e84b2c0f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e84b2c0f Branch: refs/heads/master Commit: e84b2c0f688ca044aa64cd428e9f6770c74affe5 Parents: 489c76e Author: Claus Ibsen <[email protected]> Authored: Wed Aug 3 11:57:01 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Aug 3 11:58:37 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/processor/LoggingErrorHandler.java | 3 +-- camel-core/src/main/java/org/apache/camel/processor/Pipeline.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e84b2c0f/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 36166b4..434e49c 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,7 +20,6 @@ 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 @@ -28,7 +27,7 @@ import org.springframework.context.annotation.DependsOn; * @version * @deprecated use {@link DeadLetterChannel} using a log endpoint instead */ -@DependsOn +@Deprecated public class LoggingErrorHandler extends DefaultErrorHandler { /** http://git-wip-us.apache.org/repos/asf/camel/blob/e84b2c0f/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java b/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java index ec1b070..b35252d 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java +++ b/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java @@ -117,7 +117,6 @@ public class Pipeline extends MulticastProcessor implements AsyncProcessor, Trac // implement asynchronous routing logic in callback so we can have the callback being // triggered and then continue routing where we left - //boolean sync = AsyncProcessorHelper.process(asyncProcessor, exchange, boolean sync = asyncProcessor.process(exchange, new AsyncCallback() { public void done(boolean doneSync) { // we only have to handle async completion of the pipeline
