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

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

Author: jmesnil
Date: 2009-04-17 03:28:28 -0400 (Fri, 17 Apr 2009)
New Revision: 6465

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
Messaging Server lifecycle

* start the deployers before creating the queues loaded from the journal. The queues depends on the address settings repository to be deployed to have the correct configuration

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-17 04:54:42 UTC (rev 6464)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-17 07:28:28 UTC (rev 6465)
@@ -292,6 +292,26 @@
 
       managementService.start();
 
+      // Start the deployers
+      if (configuration.isEnableFileDeployment())
+      {
+         basicUserCredentialsDeployer = new BasicUserCredentialsDeployer(deploymentManager, securityManager);
+
+         addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, addressSettingsRepository);
+
+         queueDeployer = new QueueDeployer(deploymentManager, configuration);
+
+         securityDeployer = new SecurityDeployer(deploymentManager, securityRepository);
+
+         basicUserCredentialsDeployer.start();
+
+         addressSettingsDeployer.start();
+
+         queueDeployer.start();
+
+         securityDeployer.start();
+      }
+      
       List<QueueBindingInfo> queueBindingInfos = new ArrayList<QueueBindingInfo>();
 
       storageManager.loadBindingJournal(queueBindingInfos);
@@ -450,26 +470,6 @@
       // This is the last thing done at the start, after everything else is up and running
       pagingManager.startGlobalDepage();
 
-      // Start the deployers
-      if (configuration.isEnableFileDeployment())
-      {
-         basicUserCredentialsDeployer = new BasicUserCredentialsDeployer(deploymentManager, securityManager);
-
-         addressSettingsDeployer = new AddressSettingsDeployer(deploymentManager, addressSettingsRepository);
-
-         queueDeployer = new QueueDeployer(deploymentManager, configuration);
-
-         securityDeployer = new SecurityDeployer(deploymentManager, securityRepository);
-
-         basicUserCredentialsDeployer.start();
-
-         addressSettingsDeployer.start();
-
-         queueDeployer.start();
-
-         securityDeployer.start();
-      }
-
       if (!configuration.isBackup())
       {         
          if (deploymentManager != null)
@@ -882,22 +882,20 @@
 
          doStart();
 
-         if (currentMessageID != this.storageManager.getCurrentUniqueID())
-         {
-            throw new IllegalStateException("Backup node current id sequence != live node current id sequence " + this.storageManager.getCurrentUniqueID() +
-                                            ", " +
-                                            currentMessageID);
-         }
-
          initialised = true;
 
-         // Now we can start the deploymentManager
-
          if (deploymentManager != null)
          {           
             deploymentManager.start();
          }
          
+         if (currentMessageID != this.storageManager.getCurrentUniqueID())
+         {
+            throw new IllegalStateException("Backup node current id sequence != live node current id sequence " + this.storageManager.getCurrentUniqueID() +
+                                            ", " +
+                                            currentMessageID);
+         }
+
          //Queues must be deployed *after* deploymentManager has started
          deployQueues();