Fixed bug where shutdown() call on the process proxy would hang

    indefinitely.

2 files changed, 32 insertions, 3 deletions

diff --git a/cpp/src/IcePack/Activator.cpp b/cpp/src/IcePack/Activator.cpp
index 6467909ccd5..4250241ce0b 100644
--- a/cpp/src/IcePack/Activator.cpp
+++ b/cpp/src/IcePack/Activator.cpp
@@ -46,6 +46,31 @@ private:
     Activator& _activator;
 };
 
+class ProcessShutdownCB : public AMI_Process_shutdown
+{
+public:
+
+    ProcessShutdownCB(const ActivatorPtr& activator, const string& name) : _activator(activator), _name(name)
+    {
+    }
+
+    virtual void 
+    ice_response()
+    {
+    }
+
+    virtual void 
+    ice_exception(const Ice::Exception&)
+    {
+	_activator->deactivate(_name, 0);
+    }
+
+private:
+
+    const ActivatorPtr _activator;
+    const string _name;
+};
+
 }
 
 #define ICE_STRING(X) #X
@@ -768,7 +793,7 @@ Activator::deactivate(const string& name, const Ice::ProcessPrx& process)
 	}
 	try
 	{
-	    process->shutdown();
+	    process->shutdown_async(new ProcessShutdownCB(this, name));
 	    return;
 	}
 	catch(const Ice::LocalException& ex)
diff --git a/cpp/src/IcePack/ServerI.cpp b/cpp/src/IcePack/ServerI.cpp
index f043a12c2fb..d661d32e98c 100644
--- a/cpp/src/IcePack/ServerI.cpp
+++ b/cpp/src/IcePack/ServerI.cpp
@@ -653,7 +653,7 @@ void
 ServerI::setProcess(const ::Ice::ProcessPrx& proc, const ::Ice::Current&)
 {
     IceUtil::Monitor< ::IceUtil::Mutex>::Lock sync(*this);
-    _process = proc;
+    _process = Ice::ProcessPrx::uncheckedCast(proc->ice_timeout(_waitTime));
     notifyAll();
 }
 
@@ -679,7 +679,11 @@ ServerI::stopInternal(const Ice::Current& current)
 		//
 		// Wait for the process to be set.
 		//
-		wait(); // TODO: timeout?
+		bool notify = timedWait(IceUtil::Time::seconds(_waitTime));
+		if(!notify)
+		{
+		    break;
+		}
 	    }
 	}
 	process = _process;