diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-11-08 15:47:41 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-11-08 15:47:41 +0000 |
| commit | 5c70a68ce0494c28da1d523031b4beeb8c73d234 (patch) | |
| tree | 03842665af83a5a542dd802000609093cfb5cee1 /cpp/src | |
| parent | Added ice_getCachedConnection (diff) | |
| download | ice-5c70a68ce0494c28da1d523031b4beeb8c73d234.tar.bz2 ice-5c70a68ce0494c28da1d523031b4beeb8c73d234.tar.xz ice-5c70a68ce0494c28da1d523031b4beeb8c73d234.zip | |
Added ActivationTimedOut state
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 902711b8975..4e8151d8014 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -247,6 +247,7 @@ stringToSignal(const string& str) } } throw BadSignalException("unknown signal `" + str + "'"); + return SIGTERM; // Keep the compiler happy. } } #endif diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 22078935252..cbf66ab51de 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2564,8 +2564,9 @@ ServerI::toServerState(InternalServerState st) const case ServerI::Loading: return IceGrid::Inactive; case ServerI::WaitForActivation: - case ServerI::ActivationTimeout: return IceGrid::Activating; + case ServerI::ActivationTimeout: + return IceGrid::ActivationTimedOut; case ServerI::Active: return IceGrid::Active; case ServerI::Deactivating: diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h index 593a4c7af66..6aa620d631a 100644 --- a/cpp/src/IceGrid/ServerI.h +++ b/cpp/src/IceGrid/ServerI.h @@ -56,7 +56,7 @@ public: Deactivating, DeactivatingWaitForProcess, Destroying, - Destroyed, + Destroyed }; enum ServerActivation |