summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp3
1 files changed, 2 insertions, 1 deletions
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: