Fixed bug where node couldn't be interrupted if master isn't available

1 files changed, 9 insertions, 1 deletions

diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 242d6f931f0..27426b3c3bc 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -154,6 +154,7 @@ NodeService::shutdown()
 {
     assert(_activator);
     _activator->shutdown();
+    _sessions.terminate(); // Unblock the main thread if it's blocked on waitForCreate()
     return true;
 }
 
@@ -485,7 +486,14 @@ NodeService::start(int argc, char* argv[])
     if(!bundleName.empty() || !desc.empty())
     {
 	enableInterrupt();
-	_sessions.waitForCreate();
+	if(!_sessions.waitForCreate())
+	{
+	    //
+	    // Create was interrupted, return true as if the service was
+	    // correctly initiliazed to make sure it's properly stopped.
+	    //
+	    return true;
+	}
 	disableInterrupt();
     }