Don't enable idleConnectionTimeout when it's equal to requestTimeoutInMs

Author: Stephane Landelle

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

@@ -606,7 +606,7 @@ public void operationComplete(ChannelFuture cf) {
             }
 
             int idleConnectionTimeoutInMs = config.getIdleConnectionTimeoutInMs();
-            if (idleConnectionTimeoutInMs != -1 && idleConnectionTimeoutInMs < requestTimeoutInMs) {
+            if (idleConnectionTimeoutInMs != -1 && idleConnectionTimeoutInMs <= requestTimeoutInMs) {
                 // no need for a idleConnectionTimeout that's less than the requestTimeoutInMs
                 Timeout idleConnectionTimeout = newTimeoutInMs(new IdleConnectionTimeoutTimerTask(future, this, timeoutsHolder,
                         requestTimeoutInMs, idleConnectionTimeoutInMs), idleConnectionTimeoutInMs);
@@ -1496,6 +1496,7 @@ private void markAsDone(final NettyResponseFuture<?> future, final ChannelHandle
             log.debug(t.getMessage(), t);
         }
 
+        // FIXME why isReadable and not isConnected
         if (!future.getKeepAlive() || !ctx.getChannel().isReadable()) {
             closeChannel(ctx);
         }

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

@@ -307,10 +307,9 @@ V getContent() throws ExecutionException {
     }
 
     public final void done() {
+        cancelTimeouts();
 
         try {
-            cancelTimeouts();
-
             if (exEx.get() != null) {
                 return;
             }