summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorHelper.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 89ee8a55c10..c83e69d0009 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1073,7 +1073,10 @@ ServerHelper::instantiateImpl(const ServerDescriptorPtr& instance,
instance->allocatable = _desc->allocatable;
instance->user = resolve(_desc->user, "user");
if(!instance->activation.empty() &&
- instance->activation != "manual" && instance->activation != "on-demand" && instance->activation != "always")
+ instance->activation != "manual" &&
+ instance->activation != "on-demand" &&
+ instance->activation != "always" &&
+ instance->activation != "session")
{
resolve.exception("unknown activation `" + instance->activation + "'");
}