Fixed cross test failure, memory leaks and UMRs

2 files changed, 10 insertions, 1 deletions

diff --git a/cpp/src/Ice/GC.cpp b/cpp/src/Ice/GC.cpp
index 83144936458..daf08851e72 100644
--- a/cpp/src/Ice/GC.cpp
+++ b/cpp/src/Ice/GC.cpp
@@ -389,7 +389,11 @@ void
 IceInternal::GC::updateObserver(const CommunicatorObserverPtr& observer)
 {
     Monitor<Mutex>::Lock sync(*this);
-    assert(observer);
+    if(!observer)
+    {
+        assert(!_communicatorObserver); // Communicator is destroyed.
+        return;
+    }
 
     // Only the first communicator can observe the GC thread.
     if(!_communicatorObserver)
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index dca161e3aeb..9b17a5ecf43 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -1375,6 +1375,11 @@ IceInternal::Instance::destroy()
     if(_metricsAdmin)
     {
         _metricsAdmin->destroy();
+        _metricsAdmin = 0;
+        if(CommunicatorObserverIPtr::dynamicCast(_initData.observer))
+        {
+            _initData.observer = 0; // Clear cyclic reference counts.
+        }
     }
 
     ThreadPoolPtr serverThreadPool;