diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-05-30 14:40:22 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-05-30 14:40:22 +0000 |
| commit | 3bb83324d1004564bcc6e1a56e4bc937f28b6524 (patch) | |
| tree | 4c568a7c2076b11c870dbcf261946d71bf3a0e7d /cpp/src/IceGrid/Activator.cpp | |
| parent | Fixed bug 967 (diff) | |
| download | ice-3bb83324d1004564bcc6e1a56e4bc937f28b6524.tar.bz2 ice-3bb83324d1004564bcc6e1a56e4bc937f28b6524.tar.xz ice-3bb83324d1004564bcc6e1a56e4bc937f28b6524.zip | |
Fixed bug 971 and 983.
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 4d607d551f1..dacdc8519a6 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -172,7 +172,7 @@ int stringToSignal(const string& str) { #ifdef _WIN32 - throw BadSignalException(); + throw BadSignalException("signals are not supported on Windows"); #else if(str == ICE_STRING(SIGHUP)) @@ -246,7 +246,7 @@ stringToSignal(const string& str) return static_cast<int>(signal); } } - throw BadSignalException(); + throw BadSignalException("unknown signal `" + str + "'"); } } #endif @@ -900,7 +900,7 @@ Activator::sendSignal(const string& name, int signal) // // TODO: Win32 implementation? // - throw BadSignalException(); + throw BadSignalException("signals are not supported on Windows"); #else Ice::Int pid = getServerPid(name); @@ -1045,6 +1045,10 @@ Activator::deactivateAll() { p->second.server->stop_async(0); } + catch(const ServerStopException&) + { + // Server already stopped or destroyed. + } catch(const ObjectNotExistException&) { // |