[jboss-cvs] JBoss Messaging SVN: r6387 - trunk/src/main/org/jboss/messaging/jms/server/impl.

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

Author: timfox
Date: 2009-04-09 15:06:52 -0400 (Thu, 09 Apr 2009)
New Revision: 6387

Modified:
   trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
Log:
tweak

Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java	2009-04-09 18:57:25 UTC (rev 6386)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java	2009-04-09 19:06:52 UTC (rev 6387)
@@ -116,11 +116,12 @@
       // we can't start any deployments until backup server is initialised
       DeploymentManager deploymentManager = server.getDeploymentManager();
       
-      log.info("deployment manager is " + deploymentManager);
+      if (deploymentManager != null)
+      {      
+         jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration());     
       
-      jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration());     
-      
-      jmsDeployer.start();
+         jmsDeployer.start();
+      }
       started = true;
    }
 
@@ -132,7 +133,10 @@
       {
          return;
       }
-      jmsDeployer.stop();     
+      if (jmsDeployer != null)
+      {
+         jmsDeployer.stop();
+      }
       for (String destination : destinations.keySet())
       {
          undeployDestination(destination);