460905 - Make sure TimeoutCompleteListener is cancelled if the request cannot be sent.

2 files changed, 17 insertions, 8 deletions

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
index 79f7504802..0f68b039bb 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
@@ -683,6 +683,7 @@ public class HttpRequest implements Request
             // can't even start sending the request.
             if (timeoutListener != null)
                 timeoutListener.cancel();
+            throw x;
         }
     }
 
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java
index 971ebf75b7..a715177ca9 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java
@@ -434,15 +434,23 @@ public class HttpClientTimeoutTest extends AbstractHttpClientServerTest
         start(new EmptyServerHandler());
 
         long timeout = 1000;
-        Request request = client.newRequest("bad_scheme://localhost:" + connector.getLocalPort());
-        request.timeout(timeout, TimeUnit.MILLISECONDS)
-                .send(new Response.CompleteListener()
-                {
-                    @Override
-                    public void onComplete(Result result)
+        Request request = client.newRequest("badscheme://localhost:" + connector.getLocalPort());
+
+        try
+        {
+            request.timeout(timeout, TimeUnit.MILLISECONDS)
+                    .send(new Response.CompleteListener()
                     {
-                    }
-                });
+                        @Override
+                        public void onComplete(Result result)
+                        {
+                        }
+                    });
+            Assert.fail();
+        }
+        catch (Exception expected)
+        {
+        }
 
         Thread.sleep(2 * timeout);