From af792bc7f2504e9ccf1c8ae7568919785dc397c9 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 17 Jul 2013 13:23:29 -0700 Subject: [PATCH] Do the same trick that dahlia did for Dequeue(timeout) --- OpenSim/Framework/BlockingQueue.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index aef1192364..fb74a24784 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)