svn commit: r1199137 - /camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java

[davsclaus]

Author: davsclaus
Date: Tue Nov  8 07:32:09 2011
New Revision: 1199137

URL: http://svn.apache.org/viewvc?rev=1199137&view=rev
Log:
CAMEL-4642: Do not print JMS message in toString, to avoid printing details 
from the JMS message in logs etc.

Modified:
    
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java

Modified: 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=1199137&r1=1199136&r2=1199137&view=diff
==============================================================================
--- 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
 (original)
+++ 
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
 Tue Nov  8 07:32:09 2011
@@ -27,6 +27,7 @@ import javax.jms.Topic;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.impl.DefaultMessage;
 import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,11 +48,15 @@ public class JmsMessage extends DefaultM
 
     @Override
     public String toString() {
+        // do not print jmsMessage as there could be sensitive details
         if (jmsMessage != null) {
-            return "JmsMessage: " + jmsMessage;
-        } else {
-            return "JmsMessage: " + getBody();
+            try {
+                return "JmsMessage[JmsMessageID: " + 
jmsMessage.getJMSMessageID() + "]";
+            } catch (Throwable e) {
+                // ignore
+            }
         }
+        return "JmsMessage@" + ObjectHelper.getIdentityHashCode(this);
     }
 
     @Override