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

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index 7d7f4a9291c..4922d010a4e 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -229,6 +229,11 @@ ConnectRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out)
 {
     {
         Lock sync(*this);
+        if(!_initialized)
+        {
+            out->cancelable(this); // This will throw if the request is canceled
+        }
+
         try
         {
             if(!initialized())
@@ -236,7 +241,6 @@ ConnectRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out)
                 Request req;
                 req.outAsync = out;
                 _requests.push_back(req);
-                out->cancelable(this);
                 return AsyncStatusQueued;
             }
         }