diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 10:16:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-17 10:16:43 +0200 |
| commit | 5a85eebb5e9162260ffb93f217b16f229976288b (patch) | |
| tree | 93ca91d69e9303d4895d743b7bc08d77741bdb7f /cpp/src/Ice/Instance.cpp | |
| parent | Fixed to remove need for calling updateViews after map registration (diff) | |
| download | ice-5a85eebb5e9162260ffb93f217b16f229976288b.tar.bz2 ice-5a85eebb5e9162260ffb93f217b16f229976288b.tar.xz ice-5a85eebb5e9162260ffb93f217b16f229976288b.zip | |
Moved some MX classes to IceInternal
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index d040ddddab1..8ab4f392d6a 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -40,7 +40,7 @@ #include <Ice/GC.h> #include <Ice/MetricsAdminI.h> #include <Ice/InstrumentationI.h> - + #include <IceUtil/UUID.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> @@ -1096,7 +1096,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _adminFacets.insert(FacetMap::value_type("Process", new ProcessI(communicator))); - IceMX::MetricsAdminIPtr admin = new IceMX::MetricsAdminI(_initData.properties, _initData.logger); + IceInternal::MetricsAdminIPtr admin = new IceInternal::MetricsAdminI(_initData.properties, _initData.logger); _adminFacets.insert(FacetMap::value_type("MetricsAdmin", admin)); PropertiesAdminIPtr props = new PropertiesAdminI("Properties", _initData.properties, _initData.logger); @@ -1356,6 +1356,11 @@ IceInternal::Instance::destroy() _retryQueue->destroy(); } + if(_initData.observer) + { + theCollector->clearObserver(_initData.observer); + } + ThreadPoolPtr serverThreadPool; ThreadPoolPtr clientThreadPool; EndpointHostResolverPtr endpointHostResolver; |