summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-08-06 09:56:04 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-08-06 09:56:04 +0200
commitc1e8bda5abc33ae40e3603c1a3fb6ba8645780a0 (patch)
treecf400743403ef2703a24b5044ab49c5e2385baf5 /cpp/src/Ice/ThreadPool.cpp
parentFixes (diff)
downloadice-c1e8bda5abc33ae40e3603c1a3fb6ba8645780a0.tar.bz2
ice-c1e8bda5abc33ae40e3603c1a3fb6ba8645780a0.tar.xz
ice-c1e8bda5abc33ae40e3603c1a3fb6ba8645780a0.zip
Updates
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 025822a9fa0..5036d07dba3 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -1122,11 +1122,7 @@ IceInternal::ThreadPool::EventHandlerThread::updateObserver()
{
ostringstream os;
os << _pool->_prefix << '-' << this;
- _observer = resolver->getThreadObserver(_pool->_prefix, os.str(), _state, _observer);
- if(_observer)
- {
- _observer->attach();
- }
+ _observer.attach(resolver->getThreadObserver(_pool->_prefix, os.str(), _state, _observer.get()));
}
}
@@ -1179,10 +1175,7 @@ IceInternal::ThreadPool::EventHandlerThread::run()
out << "unknown exception in `" << _pool->_prefix << "'";
}
- if(_observer)
- {
- _observer->detach();
- }
+ _observer.detach();
if(_pool->_instance->initializationData().threadHook)
{