[jboss-cvs] JBoss Messaging SVN: r5990 - trunk/src/main/org/jboss/messaging/integration/transports/netty.

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

Author: timfox
Date: 2009-03-04 07:54:06 -0500 (Wed, 04 Mar 2009)
New Revision: 5990

Modified:
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java
Log:
fixed netty connectors and acceptors

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java	2009-03-04 11:06:03 UTC (rev 5989)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java	2009-03-04 12:54:06 UTC (rev 5990)
@@ -327,6 +327,42 @@
       bossExecutor.shutdownNow();
       workerExecutor.shutdownNow();
       
+      if (bossExecutor != null)
+      {
+         for (; ;)
+         {
+            try
+            {
+               if (bossExecutor.awaitTermination(1, TimeUnit.SECONDS))
+               {
+                  break;
+               }
+            }
+            catch (InterruptedException e)
+            {
+               // Ignore
+            }
+         }
+      }
+      
+      if (workerExecutor != null)
+      {
+         for (; ;)
+         {
+            try
+            {
+               if (workerExecutor.awaitTermination(1, TimeUnit.SECONDS))
+               {
+                  break;
+               }
+            }
+            catch (InterruptedException e)
+            {
+               // Ignore
+            }
+         }
+      }
+      
       channelFactory = null;
 
       for (Connection connection : connections.values())

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java	2009-03-04 11:06:03 UTC (rev 5989)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java	2009-03-04 12:54:06 UTC (rev 5990)
@@ -334,8 +334,44 @@
       {
          bossExecutor.shutdownNow();
       }
-      workerExecutor.shutdownNow();       
+      workerExecutor.shutdownNow();  
       
+      if (bossExecutor != null)
+      {
+         for (; ;)
+         {
+            try
+            {
+               if (bossExecutor.awaitTermination(1, TimeUnit.SECONDS))
+               {
+                  break;
+               }
+            }
+            catch (InterruptedException e)
+            {
+               // Ignore
+            }
+         }
+      }
+      
+      if (workerExecutor != null)
+      {
+         for (; ;)
+         {
+            try
+            {
+               if (workerExecutor.awaitTermination(1, TimeUnit.SECONDS))
+               {
+                  break;
+               }
+            }
+            catch (InterruptedException e)
+            {
+               // Ignore
+            }
+         }
+      }
+      
       for (Connection connection : connections.values())
       {
          listener.connectionDestroyed(connection.getID());