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

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

Author: ataylor
Date: 2008-12-10 04:59:29 -0500 (Wed, 10 Dec 2008)
New Revision: 5497

Modified:
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
Log:
fix

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java	2008-12-10 00:14:27 UTC (rev 5496)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java	2008-12-10 09:59:29 UTC (rev 5497)
@@ -182,10 +182,6 @@
          //Already started
          return;
       }
-      if(httpKeepAliveTimer != null)
-      {
-         httpKeepAliveTimer.cancel();
-      }
       bossExecutor = Executors.newCachedThreadPool(new JBMThreadFactory("jbm-netty-acceptor-boss-threads"));
       workerExecutor = Executors.newCachedThreadPool(new JBMThreadFactory("jbm-netty-acceptor-worker-threads"));
       if (useNio)
@@ -270,6 +266,11 @@
          return;
       }
 
+      if(httpKeepAliveTimer != null)
+      {
+         httpKeepAliveTimer.cancel();
+         
+      }
       serverChannel.close().awaitUninterruptibly();
       bossExecutor.shutdown();
       workerExecutor.shutdown();