Rely on Netty's closeChannel to replay request instead of directly from the code. This may cause regression in some application in case the closeChannel is not called, but that would be a bug in Netty

Author: jfarcand

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

@@ -317,14 +317,9 @@ protected final <T> void writeRequest(final Channel channel,
         try {
             /**
              * If the channel is dead because it was pooled and the remote server decided to close it,
-             * we need to try to recover in order to prevent failing a valid request.
+             * we just let it go and the closeChannel do it's work.
              */
             if (!channel.isOpen() || !channel.isConnected()) {
-                if (!remotelyClosed(channel, future)) {
-                    abort(future, new ConnectException());
-                } else {
-                    log.debug("Request {} has been recovered", nettyRequest);
-                }
                 return;                
             }
 
@@ -366,12 +361,12 @@ protected final <T> void writeRequest(final Channel channel,
                     channel.write(nettyRequest).addListener(new ProgressListener(true, future.getAsyncHandler(), future));
                 } catch (Throwable cause) {
                     log.debug(cause.getMessage(), cause);
-
-                    if (future.provider().remotelyClosed(channel, future)) {
-                        return;
-                    } else {
-                        future.abort(cause);
+                    try {
+                        channel.close();
+                    } catch (RuntimeException ex) {
+                        log.debug(ex.getMessage(), ex);
                     }
+                    return;
                 }
             }
 
@@ -426,10 +421,11 @@ public void operationComplete(ChannelFuture cf) {
                 }
             }
         } catch (Throwable ioe) {
-            if (future.provider().remotelyClosed(channel, future)) {
-                return;
+            try {
+                channel.close();
+            } catch (RuntimeException ex) {
+                log.debug(ex.getMessage(), ex);
             }
-            abort(future, ioe);
         }
 
         try {
@@ -866,7 +862,7 @@ private void finishChannel(final ChannelHandlerContext ctx) {
         try {
             ctx.getChannel().close();
         } catch (Throwable t) {
-            log.error("error closing a connection", t);
+            log.debug("Error closing a connection", t);
         }
         openChannels.remove(ctx.getChannel());
     }
@@ -1604,11 +1600,12 @@ public void operationComplete(ChannelFuture cf) {
 
                 if (IllegalStateException.class.isAssignableFrom(cause.getClass())) {
                     log.debug(cause.getMessage(), cause);
-                    if (future.provider().remotelyClosed(cf.getChannel(), future)) {
-                        return;
-                    } else {
-                        future.abort(cause);
+                    try {
+                        cf.getChannel().close();
+                    } catch (RuntimeException ex) {
+                        log.debug(ex.getMessage(), ex);
                     }
+                    return;
                 }
 
                 if (ClosedChannelException.class.isAssignableFrom(cause.getClass())
@@ -1619,11 +1616,12 @@ public void operationComplete(ChannelFuture cf) {
                         log.debug(cf.getCause() == null ? "" : cf.getCause().getMessage(), cf.getCause());
                     }
 
-                    if (future.provider().remotelyClosed(cf.getChannel(), future)) {
-                        return;
-                    } else {
-                        future.abort(cause);
+                    try {
+                        cf.getChannel().close();
+                    } catch (RuntimeException ex) {
+                        log.debug(ex.getMessage(), ex);
                     }
+                    return;                    
                 } else {
                     future.abort(cause);
                 }