Skip to content

Commit 9ec190a

Browse files
author
Stephane Landelle
committed
If the Reaper awoke, there's only 2 possibilities: request timeout or idle
1 parent edc685c commit 9ec190a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,14 +1795,13 @@ public synchronized void run() {
17951795
if (nettyResponseFuture != null && !futureDone && !futureCanceled) {
17961796

17971797
long now = millisTime();
1798-
if (nettyResponseFuture.hasRequestTimedOut(now)) {
1799-
long age = (now - nettyResponseFuture.getStart()) / 1000000;
1800-
expire("Request reached time out of " + nettyResponseFuture.getRequestTimeoutInMs() + " ms after " + age + " ms");
1801-
1802-
} else if (nettyResponseFuture.hasConnectionIdleTimedOut(now)) {
1803-
long age = (now - nettyResponseFuture.getStart()) / 1000000;
1804-
expire("Request reached idle time out of " + nettyResponseFuture.getIdleConnectionTimeoutInMs() + " ms after " + age + " ms");
1805-
}
1798+
long age = (now - nettyResponseFuture.getStart()) / 1000000;
1799+
String message = null;
1800+
if (nettyResponseFuture.hasRequestTimedOut(now))
1801+
message = "Request reached time out of " + nettyResponseFuture.getRequestTimeoutInMs() + " ms after " + age + " ms";
1802+
else
1803+
message = "Request reached idle time out of " + nettyResponseFuture.getIdleConnectionTimeoutInMs() + " ms after " + age + " ms";
1804+
expire(message);
18061805

18071806
} else if (nettyResponseFuture == null || futureDone || futureCanceled) {
18081807
cancel(true);

0 commit comments

Comments
 (0)