Drop CleanupChannelGroup, close AsyncHttpClient#1176

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -23,6 +23,7 @@
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.oio.OioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
@@ -39,6 +40,7 @@
 import io.netty.util.concurrent.DefaultThreadFactory;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
+import io.netty.util.concurrent.GlobalEventExecutor;
 
 import java.io.IOException;
 import java.util.Map.Entry;
@@ -133,7 +135,7 @@ public ChannelManager(final AsyncHttpClientConfig config, Timer nettyTimer) {
         maxConnectionsPerHostEnabled = config.getMaxConnectionsPerHost() > 0;
 
         if (maxTotalConnectionsEnabled || maxConnectionsPerHostEnabled) {
-            openChannels = new CleanupChannelGroup("asyncHttpClient") {
+            openChannels = new DefaultChannelGroup("asyncHttpClient", GlobalEventExecutor.INSTANCE) {
                 @Override
                 public boolean remove(Object o) {
                     boolean removed = super.remove(o);
@@ -154,7 +156,7 @@ public boolean remove(Object o) {
             };
             freeChannels = new Semaphore(config.getMaxConnections());
         } else {
-            openChannels = new CleanupChannelGroup("asyncHttpClient");
+            openChannels = new DefaultChannelGroup("asyncHttpClient", GlobalEventExecutor.INSTANCE);
             freeChannels = null;
         }
 
@@ -354,31 +356,18 @@ public void preemptChannel(Object partitionKey) throws IOException {
         }
     }
 
-    private void doClose() {
-        channelPool.destroy();
-        openChannels.close();
-
-        for (Channel channel : openChannels) {
-            Object attribute = Channels.getAttribute(channel);
-            if (attribute instanceof NettyResponseFuture<?>) {
-                NettyResponseFuture<?> nettyFuture = (NettyResponseFuture<?>) attribute;
-                nettyFuture.cancelTimeouts();
-            }
-        }
-    }
-
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void close() {
         if (allowReleaseEventLoopGroup) {
             eventLoopGroup.shutdownGracefully(config.getShutdownQuietPeriod(), config.getShutdownTimeout(), TimeUnit.MILLISECONDS)//
                     .addListener(new FutureListener() {
                         @Override
                         public void operationComplete(Future future) throws Exception {
-                            doClose();
+                            openChannels.close();
                         }
                     });
         } else
-            doClose();
+            openChannels.close();
     }
 
     public void closeChannel(Channel channel) {
@@ -387,7 +376,6 @@ public void closeChannel(Channel channel) {
         Channels.setDiscard(channel);
         removeAll(channel);
         Channels.silentlyCloseChannel(channel);
-        openChannels.remove(channel);
     }
 
     public void abortChannelPreemption(Object partitionKey) {