Fixed ICE-5666: setting the invocation timeout to -2 provides the previous connection timeouts

1 files changed, 5 insertions, 1 deletions

diff --git a/java/src/IceInternal/ConnectRequestHandler.java b/java/src/IceInternal/ConnectRequestHandler.java
index e4c1e6b1727..a5f92ac090c 100644
--- a/java/src/IceInternal/ConnectRequestHandler.java
+++ b/java/src/IceInternal/ConnectRequestHandler.java
@@ -154,12 +154,16 @@ public class ConnectRequestHandler
     {
         synchronized(this)
         {
+            if(!_initialized)
+            {
+                out.cancelable(this); // This will throw if the request is canceled
+            }
+
             try
             {
                 if(!initialized())
                 {
                     _requests.add(new Request(out));
-                    out.cancelable(this);
                     return AsyncStatus.Queued;
                 }
             }