IdleChannelDetector should remove empty queues, close AsyncHttpClient#676

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/channel/pool/DefaultChannelPool.java

@@ -29,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
@@ -194,15 +195,21 @@ public void run(Timeout timeout) throws Exception {
                 int closedCount = 0;
                 int totalCount = 0;
 
-                for (ConcurrentLinkedQueue<IdleChannel> pool : poolsPerKey.values()) {
+                for (Map.Entry<String, ConcurrentLinkedQueue<IdleChannel>> entry : poolsPerKey.entrySet()) {
+
+                    String poolKey = entry.getKey();
+                    ConcurrentLinkedQueue<IdleChannel> pool = entry.getValue();
+
                     // store in intermediate unsynchronized lists to minimize the impact on the ConcurrentLinkedQueue
                     if (LOGGER.isDebugEnabled())
                         totalCount += pool.size();
 
                     List<IdleChannel> closedChannels = closeChannels(expiredChannels(pool, start));
+
                     pool.removeAll(closedChannels);
-                    int poolClosedCount = closedChannels.size();
-                    closedCount += poolClosedCount;
+                    closedCount += closedChannels.size();
+                    if (pool.isEmpty())
+                        poolsPerKey.remove(poolKey);
                 }
 
                 long duration = millisTime() - start;