diff options
Diffstat (limited to 'cpp/src/Ice/CommunicatorI.cpp')
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index e9a2ad4fcc6..f0272f655ca 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -17,7 +17,6 @@ #include <Ice/Properties.h> #include <Ice/ReferenceFactory.h> #include <Ice/ProxyFactory.h> -#include <Ice/ThreadPool.h> #include <Ice/ObjectFactoryManager.h> #include <Ice/UserExceptionFactoryManager.h> #include <Ice/ObjectAdapterFactory.h> @@ -40,7 +39,6 @@ Ice::CommunicatorI::destroy() if(!_destroyed) // Don't destroy twice. { _destroyed = true; - _serverThreadPool = 0; instance = _instance; } } @@ -74,18 +72,6 @@ Ice::CommunicatorI::shutdown() } void -Ice::CommunicatorI::signalShutdown() -{ - // - // No mutex locking here! This operation must be signal-safe. - // - if(_serverThreadPool) - { - _serverThreadPool->initiateShutdown(); - } -} - -void Ice::CommunicatorI::waitForShutdown() { ObjectAdapterFactoryPtr objectAdapterFactory; @@ -140,11 +126,6 @@ Ice::CommunicatorI::createObjectAdapter(const string& name) ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->createObjectAdapter(name); - if(!_serverThreadPool) // Lazy initialization of _serverThreadPool. - { - _serverThreadPool = _instance->serverThreadPool(); - } - return adapter; } |