[jboss-remoting-commits] JBoss Remoting SVN: r5222 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket.

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

Author: ron.sigal at jboss.com
Date: 2009-05-14 23:05:50 -0400 (Thu, 14 May 2009)
New Revision: 5222

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
Log:
JBREM-1132: Reorganized cleanup().

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java	2009-05-15 02:58:30 UTC (rev 5221)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java	2009-05-15 03:05:50 UTC (rev 5222)
@@ -736,11 +736,6 @@
 
    protected void cleanup()
    {
-      super.cleanup();
-
-      if (controlMonitorTimerTask != null)
-         controlMonitorTimerTask.shutdown();
-
       synchronized (controlConnectionThreadMap)
       {
          Iterator it = controlConnectionThreadMap.values().iterator();
@@ -751,6 +746,11 @@
             t.shutdown();
          }
       }
+
+      super.cleanup();
+
+      if (controlMonitorTimerTask != null)
+         controlMonitorTimerTask.shutdown();
       
       Iterator it = secondaryServerSocketThreads.iterator();
       while (it.hasNext())
@@ -1070,6 +1070,11 @@
                return;
             }
 
+            if (!running)
+            {
+               return;
+            }
+            
             try
             {
                processInvocation(socket);