added better debug tracing so that destinations are explicit in whether they are a queue or topic

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@372952 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java

@@ -16,6 +16,8 @@
  */
 package org.apache.activemq.util;
 
+import org.apache.activemq.command.ActiveMQDestination;
+
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorManager;
 import java.lang.reflect.Field;
@@ -28,6 +30,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.Map.Entry;
 
 public class IntrospectionSupport {
@@ -149,7 +152,34 @@ public class IntrospectionSupport {
     static public String toString(Object target, Class stopClass) {
         LinkedHashMap map = new LinkedHashMap();
         addFields(target, target.getClass(), stopClass, map);
-        return simpleName(target.getClass())+" "+map;
+        StringBuffer buffer = new StringBuffer(simpleName(target.getClass()));
+        buffer.append(" {");
+        Set entrySet = map.entrySet();
+        boolean first = true;
+        for (Iterator iter = entrySet.iterator(); iter.hasNext();) {
+            Map.Entry entry = (Map.Entry) iter.next();
+            if (first) {
+                first = false;
+            }
+            else {
+                buffer.append(", ");
+            }
+            buffer.append(entry.getKey());
+            buffer.append(" = ");
+            appendToString(buffer, entry.getValue());
+        }
+        buffer.append("}");
+        return buffer.toString();
+    }
+
+    protected static void appendToString(StringBuffer buffer, Object value) {
+        if (value instanceof ActiveMQDestination) {
+            ActiveMQDestination destination = (ActiveMQDestination) value;
+            buffer.append(destination.getQualifiedName());
+        }
+        else {
+            buffer.append(value);
+        }
     }
 
     static public String simpleName(Class clazz) {

activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java

@@ -190,6 +190,8 @@ public class ActiveMQMessageTest extends TestCase {
         assertTrue(msg1.getJMSExpiration() == msg2.getJMSExpiration());
         assertTrue(msg1.getJMSPriority() == msg2.getJMSPriority());
         assertTrue(msg1.getJMSTimestamp() == msg2.getJMSTimestamp());
+        
+        System.out.println("Message is:  " + msg1);
     }
 
     public void testGetAndSetJMSMessageID() throws Exception {