From a22a4db5cec02637b7653870d09b69c810d7dfe9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 18 Jul 2013 12:25:22 -0700
Subject: Revert "Revert "Do the same trick that dahlia did for
 Dequeue(timeout)""

This reverts commit 5495df74436d6c0039a1500d979a964b003abfdf.
---
 OpenSim/Framework/BlockingQueue.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index aef1192..fb74a24 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -76,9 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                bool timedout = false;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout)
                 {
-                    Monitor.Wait(m_queueSync, msTimeout);
+                    timedout = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
-- 
cgit v1.1