[jboss-cvs] JBoss Messaging SVN: r2389 - in trunk/src/main/org/jboss/messaging/core/plugin/postoffice: cluster and 1 other directory.

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

Author: timfox
Date: 2007-02-21 14:14:30 -0500 (Wed, 21 Feb 2007)
New Revision: 2389

Modified:
   trunk/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java
   trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
Log:
Make sure pool is shutdown on post office shutdown



Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java	2007-02-21 19:04:53 UTC (rev 2388)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/DefaultPostOffice.java	2007-02-21 19:14:30 UTC (rev 2389)
@@ -548,7 +548,7 @@
       }
    }
 
-   //FIXME - this is not quite right
+   // FIXME - this is not quite right
    // We should not load any bindings at startup - since then we do not have to create any queues
    // internally. Creating queues is problematic since there are params we do not know until
    // destination deploy time e.g. paging params, maxsize etc. This means we have to load the queues

Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2007-02-21 19:04:53 UTC (rev 2388)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2007-02-21 19:14:30 UTC (rev 2389)
@@ -360,6 +360,8 @@
       statsSender.stop();
 
       super.stop(sendNotification);
+      
+      pooledExecutor.shutdownAfterProcessingCurrentlyQueuedTasks();
 
       //  TODO in case of shared channels, we should have some sort of unsetReceiver(r)
       asyncChannel.setReceiver(null);
@@ -371,7 +373,7 @@
 
       // TODO - what happens if we share the channel? Don't we mess up the other applications this way?
       asyncChannel.close();
-
+      
       started = false;
 
       log.debug(this + " stopped");
@@ -1159,7 +1161,7 @@
             long lastChannelId = -1;
             Map queueNameNodeIdMap = null;
 
-            for(Iterator i = cb.getRouters().iterator(); i.hasNext(); )
+            for (Iterator i = cb.getRouters().iterator(); i.hasNext(); )
             {
                ClusterRouter router = (ClusterRouter)i.next();