diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-09 11:55:34 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-09 11:55:34 +0200 |
| commit | 462ac017296d79ef52d7c62c0938855ee7d267a2 (patch) | |
| tree | e5d5d909bfd9889b0e605c35d1a91fce3ecb2db2 /cpp/src/Ice/Instance.cpp | |
| parent | Fix (diff) | |
| download | ice-462ac017296d79ef52d7c62c0938855ee7d267a2.tar.bz2 ice-462ac017296d79ef52d7c62c0938855ee7d267a2.tar.xz ice-462ac017296d79ef52d7c62c0938855ee7d267a2.zip | |
Fix
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 1b9fda895b0..d4c83e6f980 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -39,6 +39,7 @@ #include <Ice/Observer.h> #include <Ice/GC.h> #include <Ice/MetricsAdminI.h> +#include <Ice/ObserverI.h> #include <IceUtil/UUID.h> #include <IceUtil/Mutex.h> @@ -130,7 +131,11 @@ public: void updateThreadObservers() { _instance->clientThreadPool()->updateObservers(); - _instance->serverThreadPool(false)->updateObservers(); + ThreadPoolPtr serverThreadPool = _instance->serverThreadPool(false); + if(serverThreadPool) + { + serverThreadPool->updateObservers(); + } _instance->objectAdapterFactory()->updateObservers(&ObjectAdapterI::updateThreadObservers); _instance->endpointHostResolver()->updateObserver(); theCollector->updateObserver(_instance->initializationData().observer); @@ -1078,7 +1083,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi // if(!_initData.observer) { - _adminFacets.insert(FacetMap::value_type("MetricsAdmin", new IceMX::MetricsAdminI(_initData))); + IceMX::MetricsAdminIPtr admin = new IceMX::MetricsAdminI(_initData.properties); + _adminFacets.insert(FacetMap::value_type("MetricsAdmin", admin)); + _initData.observer = new IceMX::CommunicatorObserverI(admin); } __setNoDelete(false); |