Author: dejanb
Date: Tue Nov 17 15:20:48 2009
New Revision: 881332

URL: http://svn.apache.org/viewvc?rev=881332&view=rev
Log:
merging 881274,881277 - https://issues.apache.org/activemq/browse/AMQ-2499 - don't show passwords in log files

Modified:
    activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java

Modified: activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java?rev=881332&r1=881331&r2=881332&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java (original)
+++ activemq/branches/activemq-5.3/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java Tue Nov 17 15:20:48 2009
@@ -262,23 +262,28 @@
         boolean first = true;
         for (Iterator iter = entrySet.iterator(); iter.hasNext();) {
             Map.Entry entry = (Map.Entry)iter.next();
+            Object value = entry.getValue();
+            Object key = entry.getKey();
             if (first) {
                 first = false;
             } else {
                 buffer.append(", ");
             }
-            buffer.append(entry.getKey());
+            buffer.append(key);
             buffer.append(" = ");
-            appendToString(buffer, entry.getValue());
+            
+            appendToString(buffer, key, value);
         }
         buffer.append("}");
         return buffer.toString();
     }
 
-    protected static void appendToString(StringBuffer buffer, Object value) {
+    protected static void appendToString(StringBuffer buffer, Object key, Object value) {
         if (value instanceof ActiveMQDestination) {
             ActiveMQDestination destination = (ActiveMQDestination)value;
             buffer.append(destination.getQualifiedName());
+        } else if (key.toString().toLowerCase().contains("password")){
+            buffer.append("*****");           
         } else {
             buffer.append(value);
         }