[jboss-cvs] JBossAS SVN: r62451 - branches/JBoss_4_0_1_SP1_CP/messaging/src/main/org/jboss/mq/il/uil2.

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

Author: fnasser at redhat.com
Date: 2007-04-20 18:23:01 -0400 (Fri, 20 Apr 2007)
New Revision: 62451

Modified:
   branches/JBoss_4_0_1_SP1_CP/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
Log:
Merge of JBAS-1724 one-off branch (ASPATCH-193)

Modified: branches/JBoss_4_0_1_SP1_CP/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java	2007-04-20 22:09:17 UTC (rev 62450)
+++ branches/JBoss_4_0_1_SP1_CP/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java	2007-04-20 22:23:01 UTC (rev 62451)
@@ -149,6 +149,11 @@
             writeThread.interrupt();
          }
          running.set(false);
+         if (pool != null)
+         {
+            pool.shutdownNow();
+            pool = null;
+         }
       }
    }
 
@@ -298,6 +303,8 @@
                      log.trace("Read new msg: " + msg);
 
                   // Handle the message
+                  if (pool == null)
+                     break;
                   msg.setHandler(this);
                   pool.execute(msg);
                }