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

1 files changed, 9 insertions, 2 deletions

diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 27fd7396399..2535bfc7abc 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -1153,7 +1153,13 @@ ServerI::adapterDeactivated(const string& id)
     ServerCommandPtr command;
     {
         Lock sync(*this);
-        if(_state == Active && _serverLifetimeAdapters.find(id) != _serverLifetimeAdapters.end())
+        while(_state == ServerI::Activating)
+        {
+	    wait(); // Wait for activate() to set the state to WaitForActivation
+        }
+
+        if((_state == Active || _state == WaitForActivation) &&
+           _serverLifetimeAdapters.find(id) != _serverLifetimeAdapters.end())
         {
             setStateNoSync(Deactivating);
         }
@@ -1440,12 +1446,13 @@ ServerI::deactivate()
     Ice::ProcessPrx process;
     {
         Lock sync(*this);
-        assert(_desc);
         if(_state != Deactivating && _state != DeactivatingWaitForProcess)
         {
             return;
         }
 
+        assert(_desc);
+
         //
         // If a process object is supposed to be registered and it's
         // not set yet, we wait for the server to set this process