Optimise - Fix log component to be async routing friendly.

apache · Jun 1, 2017 · 043b3bd · 043b3bd
1 parent 661f6f3
commit 043b3bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogProducer.java b/camel-core/src/main/java/org/apache/camel/component/log/LogProducer.java
@@ -17,32 +17,27 @@
 package org.apache.camel.component.log;
 
 import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultAsyncProducer;
+import org.apache.camel.util.AsyncProcessorConverterHelper;
 
 /**
  * Log producer.
  */
 public class LogProducer extends DefaultAsyncProducer {
 
-    private final Processor logger;
+    private final AsyncProcessor logger;
 
     public LogProducer(Endpoint endpoint, Processor logger) {
         super(endpoint);
-        this.logger = logger;
+        this.logger = AsyncProcessorConverterHelper.convert(logger);
     }
 
     public boolean process(Exchange exchange, AsyncCallback callback) {
-        try {
+        return logger.process(exchange, callback);
-            logger.process(exchange);
-        } catch (Exception e) {
-            exchange.setException(e);
-        } finally {
-            callback.done(true);
-        }
-        return true;
     }
 
     public Processor getLogger() {

diff --git a/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java b/camel-core/src/test/java/org/apache/camel/component/log/LogEndpointTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.log;
 
+import org.apache.camel.AsyncCallback;
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -32,9 +33,9 @@ public class LogEndpointTest extends ContextTestSupport {
     private static class MyLogger extends CamelLogProcessor {
 
         @Override
-        public void process(Exchange exchange) throws Exception {
+        public boolean process(Exchange exchange, AsyncCallback callback) {
-            super.process(exchange);
             logged = exchange;
+            return super.process(exchange, callback);
         }
 
         @Override