svn commit: r1162395 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/processor/LogProcessor.java test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java

[da...@apache.org]

Author: davsclaus
Date: Sat Aug 27 16:27:33 2011
New Revision: 1162395

URL: http://svn.apache.org/viewvc?rev=1162395&view=rev
Log:
CAMEL-4388: Fixed log eip to ensure async callback is invoked. Thanks to Sergey for the patch.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java?rev=1162395&r1=1162394&r2=1162395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java Sat Aug 27 16:27:33 2011
@@ -43,8 +43,15 @@ public class LogProcessor implements Asy
 
     @Override
     public boolean process(Exchange exchange, AsyncCallback callback) {
-        String msg = expression.evaluate(exchange, String.class);
-        logger.log(msg);
+        try {
+            String msg = expression.evaluate(exchange, String.class);
+            logger.log(msg);
+        } catch (Exception e) {
+            exchange.setException(e);
+        } finally {
+            // callback must be invoked
+            callback.done(true);
+        }
         return true;
     }
 

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java?rev=1162395&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java Sat Aug 27 16:27:33 2011
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Testing CAMEL-4388
+ */
+public class LogEipPropagateExceptionTest extends ContextTestSupport {
+
+    public void testFailure() throws Exception {
+        getMockEndpoint("mock:handleFailure").whenAnyExchangeReceived(new Processor() {
+            @Override
+            public void process(Exchange exchange) throws Exception {
+                throw new RuntimeException("TEST EXCEPTION");
+            }
+        });
+
+        getMockEndpoint("mock:exceptionFailure").expectedMessageCount(1);
+
+        sendBody("direct:startFailure", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    public void testSuccess() throws Exception {
+        getMockEndpoint("mock:handleSuccess").whenAnyExchangeReceived(new Processor() {
+            @Override
+            public void process(Exchange exchange) throws Exception {
+                throw new RuntimeException("TEST EXCEPTION");
+            }
+        });
+
+        getMockEndpoint("mock:exceptionSuccess").expectedMessageCount(1);
+
+        sendBody("direct:startSuccess", "Hello World");
+        assertMockEndpointsSatisfied();
+
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:startFailure")
+                    .onException(Throwable.class)
+                        .to("mock:exceptionFailure")
+                        .end()
+                    .to("direct:handleFailure")
+                    .to("mock:resultFailure");
+
+                from("direct:handleFailure")
+                    .errorHandler(noErrorHandler())
+                    .log("FAULTY LOG")
+                    .to("mock:handleFailure");
+
+                from("direct:startSuccess")
+                    .onException(Throwable.class)
+                        .to("mock:exceptionSuccess")
+                        .end()
+                    .to("direct:handleSuccess")
+                    .to("mock:resultSuccess");
+
+                from("direct:handleSuccess")
+                    .errorHandler(noErrorHandler())
+                    .to("mock:handleSuccess");
+            }
+        };
+    }
+
+}