diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-09 10:20:56 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-09 10:20:56 +0200 |
| commit | 62f9ccfd51f985db0539d9af7030c0461bb23008 (patch) | |
| tree | f42692c3240096e7eb400bd698125ceeec11e436 /cpp/src/Ice/Instance.cpp | |
| parent | Merge remote-tracking branch 'origin/encoding11' into mx (diff) | |
| download | ice-62f9ccfd51f985db0539d9af7030c0461bb23008.tar.bz2 ice-62f9ccfd51f985db0539d9af7030c0461bb23008.tar.xz ice-62f9ccfd51f985db0539d9af7030c0461bb23008.zip | |
Fix
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index bd085ff8d8a..1b9fda895b0 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -133,7 +133,7 @@ public: _instance->serverThreadPool(false)->updateObservers(); _instance->objectAdapterFactory()->updateObservers(&ObjectAdapterI::updateThreadObservers); _instance->endpointHostResolver()->updateObserver(); - theCollector->updateObserver(_instance->initializationData().observerResolver); + theCollector->updateObserver(_instance->initializationData().observer); } private: @@ -785,12 +785,12 @@ IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHoo } void -IceInternal::Instance::setObserverResolver(const Ice::Instrumentation::ObserverResolverPtr& observerResolver) +IceInternal::Instance::setObserver(const Ice::Instrumentation::CommunicatorObserverPtr& observer) { // // No locking, as it can only be called during plug-in loading // - _initData.observerResolver = observerResolver; + _initData.observer = observer; } IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const InitializationData& initData) : @@ -1076,7 +1076,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi // Register the metrics admin plugin only if the user didn't already set an // Ice observer resovler. // - if(!_initData.observerResolver) + if(!_initData.observer) { _adminFacets.insert(FacetMap::value_type("MetricsAdmin", new IceMX::MetricsAdminI(_initData))); } @@ -1149,10 +1149,10 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[]) // // Set observer updater // - if(_initData.observerResolver) + if(_initData.observer) { - theCollector->updateObserver(_initData.observerResolver); - _initData.observerResolver->setObserverUpdater(new ObserverUpdaterI(this)); + theCollector->updateObserver(_initData.observer); + _initData.observer->setObserverUpdater(new ObserverUpdaterI(this)); } // |