From 5495df74436d6c0039a1500d979a964b003abfdf Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 17 Jul 2013 15:04:12 -0700 Subject: Revert "Do the same trick that dahlia did for Dequeue(timeout)" This reverts commit af792bc7f2504e9ccf1c8ae7568919785dc397c9. --- OpenSim/Framework/BlockingQueue.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index fb74a24..aef1192 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs @@ -76,10 +76,9 @@ namespace OpenSim.Framework { lock (m_queueSync) { - bool timedout = false; - while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout) + if (m_queue.Count < 1 && m_pqueue.Count < 1) { - timedout = Monitor.Wait(m_queueSync, msTimeout); + Monitor.Wait(m_queueSync, msTimeout); } if (m_pqueue.Count > 0) -- cgit v1.1