summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp5
1 files changed, 5 insertions, 0 deletions
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;