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

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

Author: timfox
Date: 2009-06-01 07:47:05 -0400 (Mon, 01 Jun 2009)
New Revision: 7148

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
shutdown executor properly - this fixes test suite on Java 6

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-06-01 10:41:43 UTC (rev 7147)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-06-01 11:47:05 UTC (rev 7148)
@@ -265,7 +265,7 @@
       {
          return;
       }
-
+      
       initialisePart1();
 
       if (configuration.isBackup())
@@ -350,8 +350,14 @@
       postOffice.stop();
 
       // Need to shutdown pools before shutting down paging manager to make sure everything is written ok
-
-      scheduledPool.shutdown();
+     
+      List<Runnable> tasks = scheduledPool.shutdownNow();
+      
+      for (Runnable task: tasks)
+      {
+         log.debug("Waiting for " + task);
+      }
+            
       threadPool.shutdown();
       try
       {
@@ -365,6 +371,9 @@
          // Ignore
       }
 
+      scheduledPool = null;
+      threadPool = null;
+      
       pagingManager.stop();
 
       pagingManager = null;