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

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

Author: clebert.suconic at jboss.com
Date: 2009-04-20 12:41:59 -0400 (Mon, 20 Apr 2009)
New Revision: 6500

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
Fixes on pagingManager after the deployment ordering change

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-20 16:17:27 UTC (rev 6499)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-20 16:41:59 UTC (rev 6500)
@@ -283,8 +283,6 @@
 
       postOffice.start();
 
-      pagingManager.start();
-
       managementService.start();
       
       List<QueueBindingInfo> queueBindingInfos = new ArrayList<QueueBindingInfo>();
@@ -396,11 +394,6 @@
                                                  configuration.isBackup());
       }
 
-      // We need to startDepage when we restart the server to eventually resume destinations that were in depage mode
-      // during last stop
-      // This is the last thing done at the start, after everything else is up and running
-      pagingManager.startGlobalDepage();
-
       // Start the deployers
       if (configuration.isEnableFileDeployment())
       {
@@ -434,10 +427,14 @@
          // Deploy any pre-defined queues - must be done *after* deploymentManager has started
          deployQueues();
       }
+
       
+      pagingManager.start();
+      
       // TODO all queues should be deployed from deployQueues() wether they come from the journal or the conf
       Map<Long, Queue> queues = new HashMap<Long, Queue>();
 
+
       for (QueueBindingInfo queueBindingInfo : queueBindingInfos)
       {
          Filter filter = null;
@@ -486,6 +483,13 @@
       }
 
       started = true;
+
+      // We need to startDepage when we restart the server to eventually resume destinations that were in depage mode
+      // during last stop
+      // This is the last thing done at the start, after everything else is up and running
+      // it needs to be done after the duplicateIDMap cache was reloaded
+      pagingManager.startGlobalDepage();
+
    }
 
    public synchronized void start() throws Exception