From 976253ae160d0dd650761e37bae55f75c40764d2 Mon Sep 17 00:00:00 2001 From: Stephane Landelle Date: Tue, 25 Apr 2017 17:38:44 +0200 Subject: [PATCH] Fix NPE when channel is closed after being fetched from pool, close #1402 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Motivation: channel.remoteAddress() returns null if channel was closed after it was pulled from the pool, causing a NPE. Modification: Only schedule timeout when channel’s remoteAddress is not null Result: No more NPE --- .../asynchttpclient/netty/request/NettyRequestSender.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java b/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java index 55be45beec..16a10635c1 100755 --- a/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java +++ b/client/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.net.InetSocketAddress; +import java.net.SocketAddress; import java.util.List; import org.asynchttpclient.AsyncHandler; @@ -234,7 +235,12 @@ private ListenableFuture sendRequestWithOpenChannel(Request request, Prox } } - scheduleRequestTimeout(future, (InetSocketAddress) channel.remoteAddress()); + SocketAddress channelRemoteAddress = channel.remoteAddress(); + if (channelRemoteAddress != null) { + // otherwise, bad luck, the channel was closed, see bellow + scheduleRequestTimeout(future, (InetSocketAddress) channelRemoteAddress); + } + future.setChannelState(ChannelState.POOLED); future.attachChannel(channel, false);