aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-07-17 16:16:24 +0100
committerUbitUmarov2016-07-17 16:16:24 +0100
commit79e464f33fa60e5164874e4c3e2a189c52924ae1 (patch)
tree2400de8bd2f94e9b5be69d9f6055106c0e9e5c45
parentfix drop on delayed events processing (diff)
downloadopensim-SC-79e464f33fa60e5164874e4c3e2a189c52924ae1.zip
opensim-SC-79e464f33fa60e5164874e4c3e2a189c52924ae1.tar.gz
opensim-SC-79e464f33fa60e5164874e4c3e2a189c52924ae1.tar.bz2
opensim-SC-79e464f33fa60e5164874e4c3e2a189c52924ae1.tar.xz
dont try dequeues if didnt reacquired lock
-rw-r--r--OpenSim/Framework/BlockingQueue.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index daf99a8..f6861e4 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -78,7 +78,8 @@ namespace OpenSim.Framework
78 { 78 {
79 if (m_queue.Count < 1 && m_pqueue.Count < 1) 79 if (m_queue.Count < 1 && m_pqueue.Count < 1)
80 { 80 {
81 Monitor.Wait(m_queueSync, msTimeout); 81 if(!Monitor.Wait(m_queueSync, msTimeout))
82 return default(T);
82 } 83 }
83 84
84 if (m_pqueue.Count > 0) 85 if (m_pqueue.Count > 0)