Clean up TimeoutTasks content when cancelling, close #682

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/handler/Processor.java

@@ -178,6 +178,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws
                         }
                 }
 
+                // FIXME how does recovery occur?!
                 if (StackTraceInspector.abortOnReadOrWriteException(cause)) {
                     LOGGER.debug("Trying to recover from dead Channel: {}", channel);
                     return;

src/main/java/com/ning/http/client/providers/netty/request/timeout/TimeoutTimerTask.java

@@ -25,7 +25,7 @@ public abstract class TimeoutTimerTask implements TimerTask {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TimeoutTimerTask.class);
 
-    protected final NettyResponseFuture<?> nettyResponseFuture;
+    protected volatile NettyResponseFuture<?> nettyResponseFuture;
     protected final NettyRequestSender requestSender;
     protected final TimeoutsHolder timeoutsHolder;
 
@@ -39,4 +39,12 @@ protected void expire(String message, long time) {
         LOGGER.debug("{} for {} after {} ms", message, nettyResponseFuture, time);
         requestSender.abort(nettyResponseFuture, new TimeoutException(message));
     }
+
+    /**
+     * When the timeout is cancelled, it could still be referenced for quite some time in the Timer.
+     * Holding a reference to the future might mean holding a reference to the channel, and heavy objects such as SslEngines
+     */
+    public void clean() {
+        nettyResponseFuture = null;
+    }
 }

src/main/java/com/ning/http/client/providers/netty/request/timeout/TimeoutsHolder.java

@@ -26,10 +26,12 @@ public void cancel() {
         if (cancelled.compareAndSet(false, true)) {
             if (requestTimeout != null) {
                 requestTimeout.cancel();
+                RequestTimeoutTimerTask.class.cast(requestTimeout.getTask()).clean();
                 requestTimeout = null;
             }
             if (readTimeout != null) {
                 readTimeout.cancel();
+                ReadTimeoutTimerTask.class.cast(readTimeout.getTask()).clean();
                 readTimeout = null;
             }
         }