Fixed ICE-3627 and ICE-3370: use of new async API and removed mono workaround in Network.cs

1 files changed, 21 insertions, 9 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 69c14b31901..7180cc89500 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -124,21 +124,33 @@ public:
 
     void updateConnectionObservers()
     {
-        _instance->outgoingConnectionFactory()->updateConnectionObservers();
-        _instance->objectAdapterFactory()->updateObservers(&ObjectAdapterI::updateConnectionObservers);
+        try
+        {
+            _instance->outgoingConnectionFactory()->updateConnectionObservers();
+            _instance->objectAdapterFactory()->updateObservers(&ObjectAdapterI::updateConnectionObservers);
+        }
+        catch(const Ice::CommunicatorDestroyedException&)
+        {
+        }
     }
 
     void updateThreadObservers()
     {
-        _instance->clientThreadPool()->updateObservers();
-        ThreadPoolPtr serverThreadPool = _instance->serverThreadPool(false);
-        if(serverThreadPool)
+        try
+        {
+            _instance->clientThreadPool()->updateObservers();
+            ThreadPoolPtr serverThreadPool = _instance->serverThreadPool(false);
+            if(serverThreadPool)
+            {
+                serverThreadPool->updateObservers();
+            }
+            _instance->objectAdapterFactory()->updateObservers(&ObjectAdapterI::updateThreadObservers);
+            _instance->endpointHostResolver()->updateObserver();
+            theCollector->updateObserver(_instance->initializationData().observer);
+        }
+        catch(const Ice::CommunicatorDestroyedException&)
         {
-            serverThreadPool->updateObservers();
         }
-        _instance->objectAdapterFactory()->updateObservers(&ObjectAdapterI::updateThreadObservers);
-        _instance->endpointHostResolver()->updateObserver();
-        theCollector->updateObserver(_instance->initializationData().observer);
     }
 
 private: