svn commit: r780381 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/log/LogFormatter.java test/java/org/apache/camel/component/log/LogFormatterTest.java

[davsclaus]

Author: davsclaus
Date: Sun May 31 08:05:43 2009
New Revision: 780381

URL: http://svn.apache.org/viewvc?rev=780381&view=rev
Log:
CAMEL-1662: Added option to show the exception message for the log component.

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java?rev=780381&r1=780380&r2=780381&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogFormatter.java
 Sun May 31 08:05:43 2009
@@ -33,6 +33,7 @@
     private boolean showBodyType = true;
     private boolean showBody = true;
     private boolean showOut;
+    private boolean showException;
     private boolean showAll;
     private boolean multiline;
     private int maxChars;
@@ -71,6 +72,12 @@
             }
             sb.append(", Body:").append(getBodyAsString(in));
         }
+        if (exchange.getException() != null && (showAll || showException)) {
+            if (multiline) {
+                sb.append('\n');
+            }
+            sb.append(", 
Exception:").append(exchange.getException().getMessage());
+        }
 
         if (showAll || showOut) {
             if (exchange.hasOut()) {
@@ -181,6 +188,14 @@
         this.showAll = showAll;
     }
 
+    public boolean isShowException() {
+        return showException;
+    }
+
+    public void setShowException(boolean showException) {
+        this.showException = showException;
+    }
+
     public boolean isMultiline() {
         return multiline;
     }

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java?rev=780381&r1=780380&r2=780381&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogFormatterTest.java
 Sun May 31 08:05:43 2009
@@ -80,4 +80,16 @@
         producer.stop();
     }
 
+    public void testSendExchangeWithException() throws Exception {
+        Endpoint endpoint = 
resolveMandatoryEndpoint("log:org.apache.camel.TEST?showException=true");
+        Exchange exchange = endpoint.createExchange();
+        exchange.getIn().setBody("Hello World");
+        exchange.setException(new IllegalArgumentException("Damn"));
+
+        Producer producer = endpoint.createProducer();
+        producer.start();
+        producer.process(exchange);
+        producer.stop();
+    }
+
 }