[jboss-cvs] JBoss Messaging SVN: r3671 - trunk/tests/src/org/jboss/test/messaging/tools/container.

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

Author: ataylor
Date: 2008-02-06 09:40:56 -0500 (Wed, 06 Feb 2008)
New Revision: 3671

Modified:
   trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
Log:
added npe fix

Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2008-02-06 14:07:10 UTC (rev 3670)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2008-02-06 14:40:56 UTC (rev 3671)
@@ -556,13 +556,19 @@
    public void destroyQueue(String name, String jndiName) throws Exception
    {
       this.getMessagingServerManagement().destroyQueue(name);
-      getInitialContext().unbind(jndiName);
+      if (jndiName != null)
+      {
+         getInitialContext().unbind(jndiName);
+      }
    }
 
    public void destroyTopic(String name, String jndiName) throws Exception
    {
       this.getMessagingServerManagement().destroyTopic(name);
-      getInitialContext().unbind(jndiName);
+      if (jndiName != null)
+      {
+         getInitialContext().unbind(jndiName);
+      }
    }
 
    public void createQueue(String name, String jndiName) throws Exception