Fix to handle spurious wakeup

1 files changed, 14 insertions, 11 deletions

diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp
index 159a47c6172..4656f8484b2 100644
--- a/py/modules/IcePy/Communicator.cpp
+++ b/py/modules/IcePy/Communicator.cpp
@@ -236,17 +236,20 @@ communicatorWaitForShutdown(CommunicatorObject* self, PyObject* args)
                 t->start();
             }
 
-            bool done;
-            {
-                AllowThreads allowThreads; // Release Python's global interpreter lock during blocking calls.
-                done = (*self->shutdownMonitor).timedWait(IceUtil::Time::milliSeconds(timeout));
-            }
-
-            if(!done)
-            {
-                Py_INCREF(Py_False);
-                return Py_False;
-            }
+	    while(!self->shutdown)
+	    {
+		bool done;
+		{
+		    AllowThreads allowThreads; // Release Python's global interpreter lock during blocking calls.
+		    done = (*self->shutdownMonitor).timedWait(IceUtil::Time::milliSeconds(timeout));
+		}
+		
+		if(!done)
+		{
+		    Py_INCREF(Py_False);
+		    return Py_False;
+		}
+	    }
         }
 
         assert(self->shutdown);