1 files changed, 16 insertions, 2 deletions
diff --git a/cpp/src/IcePack/ServerI.cpp b/cpp/src/IcePack/ServerI.cpp
index f572e47ab0a..e8dcdc66a2e 100644
--- a/cpp/src/IcePack/ServerI.cpp
+++ b/cpp/src/IcePack/ServerI.cpp
@@ -43,9 +43,9 @@ IcePack::ServerI::getServerDescription(const Ice::Current&)
 }
 
 bool
-IcePack::ServerI::start(ServerActivation activation, const Ice::Current& current)
+IcePack::ServerI::start(ServerActivation act, const Ice::Current& current)
 {
-    if(activation < description.activation)
+    if(act < activation)
     {
 	return false;
     }
@@ -316,6 +316,20 @@ IcePack::ServerI::getPid(const Ice::Current& current)
     return _activator->getServerPid(this);
 }
 
+void 
+IcePack::ServerI::setActivationMode(ServerActivation mode, const ::Ice::Current&)
+{
+    IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this);
+    activation = mode;
+}
+
+ServerActivation 
+IcePack::ServerI::getActivationMode(const ::Ice::Current&)
+{
+    IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this);
+    return activation;
+}
+
 void
 IcePack::ServerI::stopInternal()
 {