Fix for https://issues.sonatype.org/browse/AHC-72

("Getting an error from AHC when a connection goes back into connection pool")

Collaborative works with Dominic Tootell

Author: jfarcand

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -1107,6 +1107,7 @@ public Object call() throws Exception {
                             return null;
                         }
                     };
+
                     if (future.getKeepAlive() && response.isChunked()) {
                         // We must make sure there is no bytes left before executing the next request.
                         ctx.setAttachment(ac);

src/main/java/com/ning/http/client/providers/netty/NettyConnectionsPool.java

@@ -158,9 +158,12 @@ public boolean offer(String uri, Channel channel) {
         int size = idleConnectionForHost.size();
         if (maxConnectionPerHost == -1 || size < maxConnectionPerHost) {
             IdleChannel idleChannel = new IdleChannel(uri, channel);
-            added = idleConnectionForHost.add(idleChannel);
-            if (channel2IdleChannel.put(channel, idleChannel) != null) {
-                log.error("Channel {} already exists in the connections pool!", channel);
+            synchronized(idleConnectionForHost) {
+                added = idleConnectionForHost.add(idleChannel);
+
+                if (channel2IdleChannel.put(channel, idleChannel) != null) {
+                    log.error("Channel {} already exists in the connections pool!", channel);
+                }
             }
         } else {
             log.debug("Maximum number of requests per host reached {} for {}", maxConnectionPerHost, uri);
@@ -183,8 +186,12 @@ public Channel poll(String uri) {
             boolean poolEmpty = false;
             while (!poolEmpty && idleChannel == null) {
                 if (idleConnectionForHost.size() > 0) {
-                    idleChannel = idleConnectionForHost.poll();
-                    if (idleChannel != null) channel2IdleChannel.remove(idleChannel.channel);
+                    synchronized(idleConnectionForHost) {
+                        idleChannel = idleConnectionForHost.poll();
+                        if (idleChannel != null) {
+                            channel2IdleChannel.remove(idleChannel.channel);
+                        }
+                    }
                 }
 
                 if (idleChannel == null) {