ICE-5585 Connection::setCallback should always invoke the callback

1 files changed, 29 insertions, 4 deletions

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 564e3ab88d7..c397e8d1b91 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1177,12 +1177,37 @@ Ice::ConnectionI::flushAsyncBatchRequests(const BatchOutgoingAsyncPtr& outAsync)
 void
 Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback)
 {
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    if(_state > StateClosing)
+    bool closed = false;
     {
-        return;
+        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+        if(_state > StateClosing)
+        {
+            closed = true;
+            return;
+        }
+        else
+        {
+            _callback = callback;
+        }
+    }
+
+    if(closed)
+    {
+        try
+        {
+            callback->closed(this);
+        }
+        catch(const std::exception& ex)
+        {
+            Error out(_instance->initializationData().logger);
+            out << "connection callback exception:\n" << ex << '\n' << _desc;
+        }
+        catch(...)
+        {
+            Error out(_instance->initializationData().logger);
+            out << "connection callback exception:\nunknown c++ exception" << '\n' << _desc;
+        }
     }
-    _callback = callback;
 }
 
 void