NETTY-417 client channel still open after close and wait

* Fixed a race condition where NioSocketChannel's state variable is updated *after* its close future is notified
* Removed unnecessary use of ChannelFutureListeners in NioSocketChannel and AbstractChannel

Author: trustin

src/main/java/org/jboss/netty/channel/AbstractChannel.java

@@ -32,7 +32,6 @@
 public abstract class AbstractChannel implements Channel {
 
     static final ConcurrentMap<Integer, Channel> allChannels = new ConcurrentHashMap<Integer, Channel>();
-    private static final IdDeallocator ID_DEALLOCATOR = new IdDeallocator();
 
     private static Integer allocateId(Channel channel) {
         Integer id = Integer.valueOf(System.identityHashCode(channel));
@@ -49,17 +48,6 @@ private static Integer allocateId(Channel channel) {
         }
     }
 
-    private static final class IdDeallocator implements ChannelFutureListener {
-        IdDeallocator() {
-            super();
-        }
-
-        @Override
-        public void operationComplete(ChannelFuture future) throws Exception {
-            allChannels.remove(future.getChannel().getId());
-        }
-    }
-
     private final Integer id;
     private final Channel parent;
     private final ChannelFactory factory;
@@ -94,7 +82,6 @@ protected AbstractChannel(
         this.pipeline = pipeline;
 
         id = allocateId(this);
-        closeFuture.addListener(ID_DEALLOCATOR);
 
         pipeline.attach(this, sink);
     }
@@ -200,6 +187,10 @@ public boolean isOpen() {
      *                      closed yet
      */
     protected boolean setClosed() {
+        // Deallocate the current channel's ID from allChannels so that other
+        // new channels can use it.
+        allChannels.remove(id);
+
         return closeFuture.setClosed();
     }
 

src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java

@@ -83,15 +83,6 @@ public NioSocketChannel(
         this.socket = socket;
         this.worker = worker;
         config = new DefaultNioSocketChannelConfig(socket.socket());
-
-        // TODO Move the state variable to AbstractChannel so that we don't need
-        //      to add many listeners.
-        getCloseFuture().addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(ChannelFuture future) throws Exception {
-                state = ST_CLOSED;
-            }
-        });
     }
 
     @Override
@@ -157,6 +148,7 @@ final void setConnected() {
 
     @Override
     protected boolean setClosed() {
+        state = ST_CLOSED;
         return super.setClosed();
     }