free semaphore permit is future is cancelled or done before channel is added to cleanup group

Author: tootedom

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

@@ -1136,6 +1136,10 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
         if (!c.future().isCancelled() || !c.future().isDone()) {
             openChannels.add(channelFuture.getChannel());
             c.future().attachChannel(channelFuture.getChannel(), false);
+        } else {
+            if (acquiredConnection) {
+                freeConnections.release();
+            }
         }
         return c.future();
     }

src/test/java/com/ning/http/client/async/netty/NettyConnectionPoolTest.java

@@ -15,9 +15,13 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
-
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+import java.net.ConnectException;
 import java.util.concurrent.TimeUnit;
 
+import com.ning.http.client.Response;
+import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig;
 import org.jboss.netty.channel.Channel;
 import org.testng.annotations.Test;
 
@@ -116,4 +120,36 @@ public void destroy() {
             client.close();
         }
     }
+
+    @Test
+    public void testHostNotContactable() {
+        NettyAsyncHttpProviderConfig conf = new NettyAsyncHttpProviderConfig();
+        conf.addProperty(NettyAsyncHttpProviderConfig.EXECUTE_ASYNC_CONNECT,false);
+        AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setAsyncHttpClientProviderConfig(conf)
+                .setAllowPoolingConnection(true).setMaximumConnectionsTotal(1).build());
+        try {
+            String url = null;
+            try {
+                url = "http://127.0.0.1:" + findFreePort();
+            } catch (Exception e) {
+                fail("unable to find free port to simulate downed host");
+            }
+            int i;
+            for (i = 0; i < 2; i++) {
+                try {
+                    log.info("{} requesting url [{}]...", i, url);
+                    Response response = client.prepareGet(url).execute().get();
+                    log.info("{} response [{}].", i, response);
+                } catch (Exception ex) {
+                    assertNotNull(ex.getCause());
+                    Throwable cause = ex.getCause();
+                    assertTrue(cause instanceof ConnectException);
+                }
+            }
+        } finally {
+            client.close();
+        }
+    }
+
+
 }