svn commit: r1124990 - in /camel/trunk/camel-core/src/main/java/org/apache/camel: processor/interceptor/DefaultTraceFormatter.java util/MessageHelper.java

[da...@apache.org]

Author: davsclaus
Date: Thu May 19 16:30:22 2011
New Revision: 1124990

URL: http://svn.apache.org/viewvc?rev=1124990&view=rev
Log:
CAMEL-3996: Tracer should not output stream/file body contents. But re-use same logic as log component.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java?rev=1124990&r1=1124989&r2=1124990&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceFormatter.java Thu May 19 16:30:22 2011
@@ -72,7 +72,7 @@ public class DefaultTraceFormatter imple
             sb.append(", BodyType:").append(MessageHelper.getBodyTypeName(in));
         }
         if (showBody) {
-            sb.append(", Body:").append(MessageHelper.extractBodyAsString(in));
+            sb.append(", Body:").append(MessageHelper.extractBodyForLogging(in, ""));
         }
         if (showOutHeaders && out != null) {
             sb.append(", OutHeaders:").append(out.getHeaders());
@@ -81,7 +81,7 @@ public class DefaultTraceFormatter imple
             sb.append(", OutBodyType:").append(MessageHelper.getBodyTypeName(out));
         }
         if (showOutBody && out != null) {
-            sb.append(", OutBody:").append(MessageHelper.extractBodyAsString(out));
+            sb.append(", OutBody:").append(MessageHelper.extractBodyForLogging(out, ""));
         }        
         if (showException && exchange.getException() != null) {
             sb.append(", Exception:").append(exchange.getException());

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=1124990&r1=1124989&r2=1124990&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java Thu May 19 16:30:22 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.util;
 
+import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
@@ -27,6 +28,7 @@ import javax.xml.transform.stream.Stream
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.StreamCache;
+import org.apache.camel.component.file.GenericFile;
 import org.apache.camel.converter.jaxp.BytesSource;
 import org.apache.camel.converter.jaxp.StringSource;
 
@@ -202,6 +204,8 @@ public final class MessageHelper {
             return prepend + "[Body is instance of java.io.Reader]";
         } else if (!allowStreams && obj instanceof Writer) {
             return prepend + "[Body is instance of java.io.Writer]";
+        } else if (obj instanceof GenericFile || obj instanceof File) {
+            return prepend + "[Body is instance file based: " + obj + "]";
         }
 
         // is the body a stream cache