[hornetq-commits] JBoss hornetq SVN: r8932 - trunk/src/main/org/hornetq/jms/server/impl.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-03-17 05:56:20 -0400 (Wed, 17 Mar 2010)
New Revision: 8932

Modified:
   trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
Log:
JMS Server deployment

* do not start the JMSServerDeployer if HornetQ configuration
  has disabled file deployment

Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2010-03-17 05:20:45 UTC (rev 8931)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2010-03-17 09:56:20 UTC (rev 8932)
@@ -139,16 +139,19 @@
          // start the JMS deployer only if the configuration is not done using the JMSConfiguration object
          if (config == null)
          {
-            jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration());
-
-            if (configFileName != null)
+            if (server.getConfiguration().isFileDeploymentEnabled())
             {
-               jmsDeployer.setConfigFileNames(new String[] { configFileName });
-            }
+               jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration());
 
-            jmsDeployer.start();
+               if (configFileName != null)
+               {
+                  jmsDeployer.setConfigFileNames(new String[] { configFileName });
+               }
 
-            deploymentManager.start();
+               jmsDeployer.start();
+
+               deploymentManager.start();
+            }
          }
          else
          {