[jboss-remoting-commits] JBoss Remoting SVN: r5095 - remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/transport/bisocket.

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

Author: ron.sigal at jboss.com
Date: 2009-04-30 17:32:52 -0400 (Thu, 30 Apr 2009)
New Revision: 5095

Modified:
   remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
Log:
JBREM-1112 (and others to be named): LeasePingerID, single ConnectionValidator per client invoker.

Modified: remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java
===================================================================
--- remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java	2009-04-30 21:32:26 UTC (rev 5094)
+++ remoting2/branches/2.2.2-SP11_JBREM-1112/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java	2009-04-30 21:32:52 UTC (rev 5095)
@@ -515,11 +515,8 @@
 
    protected void cleanup()
    {
-      super.cleanup();
+//      super.cleanup();
 
-      if (controlMonitorTimerTask != null)
-         controlMonitorTimerTask.shutdown();
-
       synchronized (controlConnectionThreadMap)
       {
          Iterator it = controlConnectionThreadMap.values().iterator();
@@ -531,6 +528,11 @@
          }
       }
       
+      super.cleanup();
+      
+      if (controlMonitorTimerTask != null)
+         controlMonitorTimerTask.shutdown();
+      
       if (secondaryServerSocketThread != null)
          secondaryServerSocketThread.shutdown();
 
@@ -834,14 +836,18 @@
                return;
             }
 
-
+            if (!running)
+            {
+               return;
+            }
+            
             try
             {
                processInvocation(socket);
             }
             catch (Exception e)
             {
-               log.error("Unable to create new ServerThread: " + e.getMessage(), e);
+               log.error(BisocketServerInvoker.this + " Unable to create new ServerThread: " + e.getMessage(), e);
             }
          }
       }