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

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

Author: clebert.suconic at jboss.com
Date: 2009-01-19 12:23:09 -0500 (Mon, 19 Jan 2009)
New Revision: 5660

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
Fix on Page tests

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-01-19 15:10:16 UTC (rev 5659)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-01-19 17:23:09 UTC (rev 5660)
@@ -295,6 +295,9 @@
 
       Map<SimpleString, List<Pair<SimpleString, Long>>> duplicateIDMap = new HashMap<SimpleString, List<Pair<SimpleString, Long>>>();
 
+      
+      pagingManager.reloadStores();
+
       storageManager.loadMessageJournal(postOffice,
                                         storageManager,
                                         queueSettingsRepository,
@@ -314,8 +317,6 @@
          }
       }
 
-      pagingManager.reloadStores();
-
       resourceManager.start();
 
       // Deploy any pre-defined queues
@@ -383,6 +384,12 @@
                                                           remotingService,
                                                           this,
                                                           queueFactory);
+      
+      
+      
+      // 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();
 
       log.info("Started messaging server");