You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2019/04/21 12:19:39 UTC
[httpcomponents-core] 01/01: HTTPCORE-370,
HTTPCORE-574: discard non-blocking session request immediately upon
timeout
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch HTTPCORE-574
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit aa812282f26fdd1975233a892c5405fa0da781b4
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Fri Apr 5 13:55:57 2019 +0200
HTTPCORE-370, HTTPCORE-574: discard non-blocking session request immediately upon timeout
---
.../apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
index da21c1b..1dcea63 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
@@ -207,7 +207,11 @@ public class DefaultConnectingIOReactor extends AbstractMultiworkerIOReactor
final int timeout = sessionRequest.getConnectTimeout();
if (timeout > 0) {
if (handle.getRequestTime() + timeout < now) {
- sessionRequest.timeout();
+ try {
+ sessionRequest.timeout();
+ } finally {
+ key.attach(null);
+ }
}
}
}