[jboss-cvs] JBoss Messaging SVN: r2058 - trunk/src/main/org/jboss/jms/server/destination.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-01-25 13:43:12 -0500 (Thu, 25 Jan 2007)
New Revision: 2058

Modified:
   trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java
Log:
I had a situation where an exception was thrown during start.
There was then a  try..catch() using this toString()... and some variables were null..masking the real cause of the first exception.

Modified: trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java	2007-01-25 17:53:09 UTC (rev 2057)
+++ trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java	2007-01-25 18:43:12 UTC (rev 2058)
@@ -433,13 +433,24 @@
          sb.append("Topic");
       }
       sb.append('[');
-      if (destination.getName().equals(nameFromJNDI))
+      if (destination == null)
       {
-         sb.append(destination.getJndiName());
+         sb.append("(NULL Destination)");
       }
+      else if (destination.getName() == null)
+      {
+         sb.append("(destination.getName() == NULL)");
+      }
       else
       {
-         sb.append(destination.getJndiName()).append(", name=").append(destination.getName());
+         if (destination.getName().equals(nameFromJNDI))
+         {
+            sb.append(destination.getJndiName());
+         }
+         else
+         {
+            sb.append(destination.getJndiName()).append(", name=").append(destination.getName());
+         }
       }
       sb.append(']');
       return sb.toString();