Init TimeoutsHolder remoteAddress from NettyChannelConnector

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/request/NettyChannelConnector.java

@@ -25,18 +25,21 @@
 import org.asynchttpclient.handler.AsyncHandlerExtensions;
 import org.asynchttpclient.netty.SimpleChannelFutureListener;
 import org.asynchttpclient.netty.channel.NettyConnectListener;
+import org.asynchttpclient.netty.timeout.TimeoutsHolder;
 
 public class NettyChannelConnector {
 
     private final AsyncHandlerExtensions asyncHandlerExtensions;
     private final InetSocketAddress localAddress;
     private final List<InetSocketAddress> remoteAddresses;
+    private final TimeoutsHolder timeoutsHolder;
     private volatile int i = 0;
 
-    public NettyChannelConnector(InetAddress localAddress, List<InetSocketAddress> remoteAddresses, AsyncHandler<?> asyncHandler) {
+    public NettyChannelConnector(InetAddress localAddress, List<InetSocketAddress> remoteAddresses, AsyncHandler<?> asyncHandler, TimeoutsHolder timeoutsHolder) {
         this.localAddress = localAddress != null ? new InetSocketAddress(localAddress, 0) : null;
         this.remoteAddresses = remoteAddresses;
         this.asyncHandlerExtensions = toAsyncHandlerExtensions(asyncHandler);
+        this.timeoutsHolder = timeoutsHolder;
     }
 
     private boolean pickNextRemoteAddress() {
@@ -46,7 +49,7 @@ private boolean pickNextRemoteAddress() {
 
     public void connect(final Bootstrap bootstrap, final NettyConnectListener<?> connectListener) {
         final InetSocketAddress remoteAddress = remoteAddresses.get(i);
-        
+
         if (asyncHandlerExtensions != null)
             asyncHandlerExtensions.onTcpConnectAttempt(remoteAddress);
 
@@ -56,9 +59,10 @@ public void connect(final Bootstrap bootstrap, final NettyConnectListener<?> con
 
             @Override
             public void onSuccess(Channel channel) throws Exception {
-                if (asyncHandlerExtensions != null)
+                if (asyncHandlerExtensions != null) {
                     asyncHandlerExtensions.onTcpConnectSuccess(remoteAddress, future.channel());
-
+                }
+                timeoutsHolder.initRemoteAddress(remoteAddress);
                 connectListener.onSuccess(channel);
             }
 

client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -277,7 +277,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
                     @Override
                     protected void onSuccess(List<InetSocketAddress> addresses) {
                         NettyConnectListener<T> connectListener = new NettyConnectListener<>(future, NettyRequestSender.this, channelManager, channelPreempted, partitionKey);
-                        new NettyChannelConnector(request.getLocalAddress(), addresses, asyncHandler).connect(bootstrap, connectListener);
+                        new NettyChannelConnector(request.getLocalAddress(), addresses, asyncHandler, future.getTimeoutsHolder()).connect(bootstrap, connectListener);
                     }
 
                     @Override

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

@@ -14,12 +14,11 @@
 package org.asynchttpclient.netty.timeout;
 
 import static org.asynchttpclient.util.DateUtils.millisTime;
-import io.netty.channel.Channel;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import io.netty.util.TimerTask;
 
-import java.net.SocketAddress;
+import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -61,19 +60,11 @@ public TimeoutsHolder(Timer nettyTimer, NettyResponseFuture<?> nettyResponseFutu
         }
     }
 
-    private void initRemoteAddress() {
-        Channel channel = nettyResponseFuture.channel();
-        if (channel != null) {
-            SocketAddress sa = channel.remoteAddress();
-            if (sa != null) {
-                remoteAddress = sa.toString();
-            }
-        }
+    public void initRemoteAddress(InetSocketAddress address) {
+        remoteAddress = address.toString();
     }
 
     public void startReadTimeout() {
-        // we should be connected now
-        initRemoteAddress();
         if (readTimeoutValue != -1) {
             startReadTimeout(null);
         }