[jboss-cvs] JBoss Messaging SVN: r8070 - branches/Branch_1_4/src/main/org/jboss/jms/server.

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

Author: gaohoward
Date: 2010-07-15 10:30:11 -0400 (Thu, 15 Jul 2010)
New Revision: 8070

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/server/DestinationJNDIMapper.java
Log:
JBMESSAGING-1762


Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/DestinationJNDIMapper.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/DestinationJNDIMapper.java	2010-07-12 06:28:38 UTC (rev 8069)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/DestinationJNDIMapper.java	2010-07-15 14:30:11 UTC (rev 8070)
@@ -261,8 +261,16 @@
          unregisterDestination((ManagedDestination)i.next());
       }
 
-      initialContext.unbind(serverPeer.getDefaultQueueJNDIContext());
-      initialContext.unbind(serverPeer.getDefaultTopicJNDIContext());
+      String defaultJndi = serverPeer.getDefaultQueueJNDIContext();
+      if (!defaultJndi.trim().equals(""))
+      {
+         initialContext.unbind(defaultJndi);
+      }
+      defaultJndi = serverPeer.getDefaultTopicJNDIContext();
+      if (!defaultJndi.trim().equals(""))
+      {
+         initialContext.unbind(defaultJndi);
+      }
 
       initialContext.close();
    }