Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

Conflicts:

	cpp/src/IceGrid/SessionServantManager.cpp

1 files changed, 21 insertions, 3 deletions

diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 507867753d8..f6806884fb5 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -833,18 +833,31 @@ void
 ServerI::setProcess_async(const AMD_Server_setProcessPtr& amdCB, const Ice::ProcessPrx& process, const Ice::Current&)
 {
     bool deact = false;
+    ServerCommandPtr command;
     {
         Lock sync(*this);
         checkDestroyed();
         _process = process;
-        deact = _state == DeactivatingWaitForProcess;
-        notifyAll();
+        if(_state == DeactivatingWaitForProcess)
+        {
+            deact = true;
+        }
+        else
+        {
+            checkActivation();
+            command = nextCommand();
+        }
     }
     amdCB->ice_response();
+
     if(deact)
     {
         deactivate();
     }
+    else if(command)
+    {
+        command->execute();
+    }
 }
 
 Ice::Long
@@ -2282,7 +2295,12 @@ ServerI::checkActivation()
     //assert(locked());
     if(_state == ServerI::WaitForActivation || _state == ServerI::ActivationTimeout)
     {
-        if(includes(_activatedAdapters.begin(), _activatedAdapters.end(),
+        //
+        // Mark the server as active if the server process proxy is registered (or it's not expecting 
+        // one to be registered) and if all the server lifetime adapters have been activated.
+        //
+        if((!_desc->processRegistered || _process) &&
+           includes(_activatedAdapters.begin(), _activatedAdapters.end(),
                     _serverLifetimeAdapters.begin(), _serverLifetimeAdapters.end()))
         {
             setStateNoSync(ServerI::Active);