Fixes #6382 - HttpClient TimeoutException message reports transient v…

…alues. Now using consistently HttpConversation.getTimeout() to report the accurate value. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Jun 21, 2021 · 734d3b6 · 734d3b6
1 parent 738d3a9
commit 734d3b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@@ -331,7 +331,7 @@ protected boolean onExpired(HttpChannel channel)
             if (exchange != null)
             {
                 HttpRequest request = exchange.getRequest();
-                request.abort(new TimeoutException("Total timeout " + request.getTimeout() + " ms elapsed"));
+                request.abort(new TimeoutException("Total timeout " + request.getConversation().getTimeout() + " ms elapsed"));
             }
             return false;
         }

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java
@@ -564,7 +564,7 @@ protected Iterator<HttpExchange> iterator()
         protected boolean onExpired(HttpExchange exchange)
         {
             HttpRequest request = exchange.getRequest();
-            request.abort(new TimeoutException("Total timeout " + request.getTimeout() + " ms elapsed"));
+            request.abort(new TimeoutException("Total timeout " + request.getConversation().getTimeout() + " ms elapsed"));
             return false;
         }
     }

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java
@@ -511,14 +511,16 @@ protected void service(String target, Request jettyRequest, HttpServletRequest r
             }
         });
 
-        assertThrows(TimeoutException.class, () ->
+        long timeout = 1000;
+        TimeoutException timeoutException = assertThrows(TimeoutException.class, () ->
         {
             client.setMaxRedirects(-1);
             client.newRequest("localhost", connector.getLocalPort())
                 .scheme(scenario.getScheme())
-                .timeout(1, TimeUnit.SECONDS)
+                .timeout(timeout, TimeUnit.MILLISECONDS)
                 .send();
         });
+        assertThat(timeoutException.getMessage(), Matchers.containsString(String.valueOf(timeout)));
     }
 
     @ParameterizedTest