diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
| commit | abeebf67ba35156606bbaabf073b496900f836cf (patch) | |
| tree | 430212c34a1a1d4922fa11426e9fbd537fb98e52 /cpp/src/Ice/ThreadPool.cpp | |
| parent | Fixed dependencies (diff) | |
| download | ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.bz2 ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.xz ice-abeebf67ba35156606bbaabf073b496900f836cf.zip | |
Fixed ICE-5620: metrics admin creation in IceBox, fixed bug where timer wasn't instrumented
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 1b2907a87c6..a1bb3ab424e 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -1261,7 +1261,7 @@ void IceInternal::ThreadPool::EventHandlerThread::updateObserver() { // Must be called with the thread pool mutex locked - const CommunicatorObserverPtr& obsv = _pool->_instance->getObserver(); + const CommunicatorObserverPtr& obsv = _pool->_instance->initializationData().observer; if(obsv) { _observer.attach(obsv->getThreadObserver(_pool->_prefix, name(), _state, _observer.get())); |