[jboss-cvs] JBoss Messaging SVN: r4852 - trunk/src/main/org/jboss/messaging/core/remoting/impl/netty.

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

Author: trustin
Date: 2008-08-20 04:42:04 -0400 (Wed, 20 Aug 2008)
New Revision: 4852

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java
Log:
Fixed dead lock (should be fixed again once Netty 3 CR2 is released.)

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java	2008-08-20 08:30:00 UTC (rev 4851)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnection.java	2008-08-20 08:42:04 UTC (rev 4852)
@@ -80,14 +80,19 @@
          channel.close();
       }
 
-      if (channel.getParent() == null) {
-         // A client channel - wait until everything is cleaned up.
-         // TODO Do not spin - use signal.
-         MessagingChannelHandler handler = (MessagingChannelHandler) channel.getPipeline().get("handler");
-         while (handler.active) {
-            Thread.yield();
-         }
-      }
+//      This block has been disabled because this method can be called from
+//      the Netty I/O thread.
+//      TODO Netty should be improved to provide a way to determine
+//           if the current code is running in the I/O thread.
+//
+//      if (channel.getParent() == null) {
+//         // A client channel - wait until everything is cleaned up.
+//         // TODO Do not spin - use signal.
+//         MessagingChannelHandler handler = (MessagingChannelHandler) channel.getPipeline().get("handler");
+//         while (handler.active) {
+//            Thread.yield();
+//         }
+//      }
 
       closed = true;
    }