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

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2009-11-06 07:02:52 -0500 (Fri, 06 Nov 2009)
New Revision: 8238

Modified:
   trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
Log:
fixed bogus condition (from r8237)

* configFileName can be null => the file deployment manager will use default name (hornetq-jms.xml)
* checked instead if JMSConfiguration object is null

Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2009-11-06 10:46:19 UTC (rev 8237)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2009-11-06 12:02:52 UTC (rev 8238)
@@ -132,19 +132,21 @@
       {
          jmsManagementService.registerJMSServer(this);
 
-         // start the JMS deployer only if the configuration is using configuration files
-         if (configFileName != null)
+         // 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());
 
-            jmsDeployer.setConfigFileNames(new String[] { configFileName });
+            if (configFileName != null)
+            {
+               jmsDeployer.setConfigFileNames(new String[] { configFileName });
+            }
 
             jmsDeployer.start();
 
             deploymentManager.start();
-         }
-
-         if (config != null)
+         } 
+         else
          {
             deploy();
          }         
@@ -169,10 +171,7 @@
          context = new InitialContext();
       }
 
-      if (configFileName != null)
-      {
-         deploymentManager = new FileDeploymentManager(server.getConfiguration().getFileDeployerScanPeriod());
-      }
+      deploymentManager = new FileDeploymentManager(server.getConfiguration().getFileDeployerScanPeriod());
       
       server.registerActivateCallback(this);