OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)"" 

This reverts commit 5495df7443.
TeleportWork
Diva Canto 2013-07-18 12:25:22 -07:00
parent 552b85d33d
commit a22a4db5ce
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/BlockingQueue.cs
View File

@ -76,9 +76,10 @@ namespace OpenSim.Framework
{ {
lock (m_queueSync) 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) if (m_pqueue.Count > 0)