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 2024/11/28 07:48:23 UTC
(httpcomponents-core) branch 5.3.x updated: Optimize connection close logic to resolve timeout delay issue (#508)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch 5.3.x
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
The following commit(s) were added to refs/heads/5.3.x by this push:
new 00b543740 Optimize connection close logic to resolve timeout delay issue (#508)
00b543740 is described below
commit 00b543740d3d8ac05442df9815f7b143ca84b2e3
Author: Noah <yu...@gmail.com>
AuthorDate: Thu Nov 28 16:38:45 2024 +0900
Optimize connection close logic to resolve timeout delay issue (#508)
---
.../hc/core5/http/impl/io/HttpRequestExecutor.java | 8 +++++++-
.../http/impl/io/TestHttpRequestExecutor.java | 23 ++++++++++++++++++----
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
index e97f79fa9..de8c5fdd4 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/HttpRequestExecutor.java
@@ -54,10 +54,13 @@ import org.apache.hc.core5.http.message.StatusLine;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.io.Closer;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Timeout;
+import javax.net.ssl.SSLException;
+
/**
* {@code HttpRequestExecutor} is a client side HTTP protocol handler based
* on the blocking (classic) I/O model.
@@ -211,9 +214,12 @@ public class HttpRequestExecutor {
}
return response;
- } catch (final HttpException | IOException | RuntimeException ex) {
+ } catch (final HttpException | SSLException ex) {
Closer.closeQuietly(conn);
throw ex;
+ } catch (final IOException | RuntimeException ex) {
+ Closer.close(conn, CloseMode.IMMEDIATE);
+ throw ex;
}
}
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
index d961c5a28..f9451bf82 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
@@ -27,9 +27,6 @@
package org.apache.hc.core5.http.impl.io;
-import java.io.IOException;
-import java.util.List;
-
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HeaderElements;
@@ -37,12 +34,14 @@ import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.Method;
+import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.http.io.HttpResponseInformationCallback;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -50,6 +49,9 @@ import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
+import java.io.IOException;
+import java.util.List;
+
class TestHttpRequestExecutor {
@Test
@@ -402,7 +404,7 @@ class TestHttpRequestExecutor {
Mockito.doThrow(new IOException("Oopsie")).when(conn).sendRequestHeader(request);
Assertions.assertThrows(IOException.class, () -> executor.execute(request, conn, context));
- Mockito.verify(conn).close();
+ Mockito.verify(conn).close(CloseMode.IMMEDIATE);
}
@Test
@@ -415,6 +417,19 @@ class TestHttpRequestExecutor {
Mockito.doThrow(new RuntimeException("Oopsie")).when(conn).receiveResponseHeader();
Assertions.assertThrows(RuntimeException.class, () -> executor.execute(request, conn, context));
+ Mockito.verify(conn).close(CloseMode.IMMEDIATE);
+ }
+
+ @Test
+ void testExecutionHttpException() throws Exception {
+ final HttpClientConnection conn = Mockito.mock(HttpClientConnection.class);
+ final HttpRequestExecutor executor = new HttpRequestExecutor();
+
+ final HttpCoreContext context = HttpCoreContext.create();
+ final ClassicHttpRequest request = new BasicClassicHttpRequest(Method.GET, "/");
+
+ Mockito.doThrow(new HttpException("Oopsie")).when(conn).receiveResponseHeader();
+ Assertions.assertThrows(HttpException.class, () -> executor.execute(request, conn, context));
Mockito.verify(conn).close();
}