[jboss-cvs] JBoss Messaging SVN: r3649 - trunk/src/main/org/jboss/messaging/deployers.

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

Author: clebert.suconic at jboss.com
Date: 2008-01-30 17:47:52 -0500 (Wed, 30 Jan 2008)
New Revision: 3649

Modified:
   trunk/src/main/org/jboss/messaging/deployers/DeploymentManager.java
Log:
I have seen several NPEs on the testsuite on this condition (look at the diff)... just a small fix.

Modified: trunk/src/main/org/jboss/messaging/deployers/DeploymentManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/deployers/DeploymentManager.java	2008-01-30 17:45:49 UTC (rev 3648)
+++ trunk/src/main/org/jboss/messaging/deployers/DeploymentManager.java	2008-01-30 22:47:52 UTC (rev 3649)
@@ -150,8 +150,11 @@
       deployables.remove(deployable);
       if(deployables.size() == 0)
       {
-         scheduler.shutdown();
-         scheduler = null;
+         if (scheduler != null)
+         {
+            scheduler.shutdown();
+            scheduler = null;
+         }
       }
    }
    /**