svn commit: r1162396 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java

[davsclaus]

Author: davsclaus
Date: Sat Aug 27 16:31:30 2011
New Revision: 1162396

URL: http://svn.apache.org/viewvc?rev=1162396&view=rev
Log:
Merged revisions 1162395 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


Added:
    
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java
      - copied unchanged from r1162395, 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LogEipPropagateExceptionTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 27 16:31:30 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1160637,1161010,1161082,1161524,1162309
+/camel/trunk:1150651,1151054,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java?rev=1162396&r1=1162395&r2=1162396&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
 (original)
+++ 
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
 Sat Aug 27 16:31:30 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;
     }