summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2003-03-31 18:56:43 +0000
committerBenoit Foucher <benoit@zeroc.com>2003-03-31 18:56:43 +0000
commit11552b9bdf4221b54c11d1edac56ace223ef7070 (patch)
treec72b211689216317b9f64f1a73f16557a34abef5 /cpp/src/Ice/ThreadPool.cpp
parentIceStorm changes (diff)
downloadice-11552b9bdf4221b54c11d1edac56ace223ef7070.tar.bz2
ice-11552b9bdf4221b54c11d1edac56ace223ef7070.tar.xz
ice-11552b9bdf4221b54c11d1edac56ace223ef7070.zip
Correctly handle CommunicatorDestroyedException when calling
Instance::objectAdapterFactory()
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 50b9adf3581..5f4f6dfb6f2 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -488,8 +488,12 @@ IceInternal::ThreadPool::run()
//
// Initiate server shutdown.
//
- ObjectAdapterFactoryPtr factory = _instance->objectAdapterFactory();
- if(!factory)
+ ObjectAdapterFactoryPtr factory;
+ try
+ {
+ factory = _instance->objectAdapterFactory();
+ }
+ catch(const Ice::CommunicatorDestroyedException&)
{
continue;
}