Fix race condition causing NPE, close AsyncHttpClient#1049

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -17,7 +17,6 @@
 import static org.asynchttpclient.util.MiscUtils.getCause;
 import io.netty.channel.Channel;
 
-import java.net.SocketAddress;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
@@ -410,10 +409,6 @@ public boolean canRetry() {
         return maxRetry > 0 && currentRetry.incrementAndGet() <= maxRetry;
     }
 
-    public SocketAddress getChannelRemoteAddress() {
-        return channel != null ? channel.remoteAddress() : null;
-    }
-
     public void setTargetRequest(Request targetRequest) {
         this.targetRequest = targetRequest;
     }

client/src/main/java/org/asynchttpclient/netty/timeout/TimeoutTimerTask.java

@@ -13,6 +13,7 @@
  */
 package org.asynchttpclient.netty.timeout;
 
+import io.netty.channel.Channel;
 import io.netty.util.TimerTask;
 
 import java.net.SocketAddress;
@@ -39,8 +40,9 @@ public TimeoutTimerTask(NettyResponseFuture<?> nettyResponseFuture, NettyRequest
         this.requestSender = requestSender;
         this.timeoutsHolder = timeoutsHolder;
         // saving remote address as the channel might be removed from the future when an exception occurs
-        SocketAddress sa = nettyResponseFuture.getChannelRemoteAddress();
-        remoteAddress = sa != null ? sa.toString() : "not-connected";
+        Channel channel = nettyResponseFuture.channel();
+        SocketAddress sa = channel == null ? null : channel.remoteAddress();
+        remoteAddress = sa == null ? "not-connected" : sa.toString();
     }
 
     protected void expire(String message, long time) {