summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/ServiceManagerI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-08-05 21:01:03 +0000
committerBernard Normier <bernard@zeroc.com>2003-08-05 21:01:03 +0000
commita3b8e6df92d919f7f7aec4f1c54f55da28f9f242 (patch)
tree12458748e45e7234905a7db9fa305a7a75d12421 /cpp/src/IceBox/ServiceManagerI.cpp
parentfile IceAtomic.c was initially added on branch R1_1_branch. (diff)
downloadice-a3b8e6df92d919f7f7aec4f1c54f55da28f9f242.tar.bz2
ice-a3b8e6df92d919f7f7aec4f1c54f55da28f9f242.tar.xz
ice-a3b8e6df92d919f7f7aec4f1c54f55da28f9f242.zip
Merging from 1.1 branch
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index f4e8d5f5c17..dcb8162fc1a 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -385,6 +385,13 @@ IceBox::ServiceManagerI::stopAll()
info.communicator->shutdown();
info.communicator->waitForShutdown();
}
+ catch(const Ice::CommunicatorDestroyedException&)
+ {
+ //
+ // Ignore, the service might have already destroyed
+ // the communicator for its own reasons.
+ //
+ }
catch(const Ice::Exception& ex)
{
Warning out(_logger);