Netty Channel pool key should be (proxy +) target, close #364

Author: Stephane Landelle

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

@@ -1287,20 +1287,21 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth, Request request, ProxySer
         addType3NTLMAuthorizationHeader(wwwAuth, headers, proxyServer.getPrincipal(), proxyServer.getPassword(), proxyServer.getNtlmDomain(), proxyServer.getHost());
         Realm newRealm;
 
-        Realm.RealmBuilder realmBuilder;
+        Realm.RealmBuilder realmBuilder = new Realm.RealmBuilder();
         if (realm != null) {
-            realmBuilder = new Realm.RealmBuilder().clone(realm);
-        } else {
-            realmBuilder = new Realm.RealmBuilder();
+            realmBuilder = realmBuilder.clone(realm);
         }
         newRealm = realmBuilder.setUri(request.getURI().getPath()).setMethodName(request.getMethod()).build();
 
         return newRealm;
     }
 
-    private String getPoolKey(NettyResponseFuture<?> future) throws MalformedURLException {
-        URI uri = future.getProxyServer() != null ? future.getProxyServer().getURI() : future.getURI();
-        return future.getConnectionPoolKeyStrategy().getKey(uri);
+    private String getPoolKey(NettyResponseFuture<?> future) {
+        
+        String serverPart = future.getConnectionPoolKeyStrategy().getKey(future.getURI());
+
+        ProxyServer proxy = future.getProxyServer();
+        return proxy != null? AsyncHttpProviderUtils.getBaseUrl(proxy.getURI()) + serverPart : serverPart;
     }
 
     private void drainChannel(final ChannelHandlerContext ctx, final NettyResponseFuture<?> future) {

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

@@ -17,7 +17,6 @@
 
 import static com.ning.http.util.DateUtil.millisTime;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
@@ -121,7 +120,7 @@ public NettyResponseFuture(URI uri,//
         writeBody = true;
     }
 
-    protected URI getURI() throws MalformedURLException {
+    protected URI getURI() {
         return uri;
     }