diff options
| author | Diva Canto | 2013-07-18 12:25:47 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-18 12:25:47 -0700 |
| commit | 71b1511db5c697a2748c87adafe94db8ce408a8d (patch) | |
| tree | d434911cab0217d6cee6fbcb0948d27273bf03e4 /OpenSim/Framework/BlockingQueue.cs | |
| parent | Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)"" (diff) | |
| download | opensim-SC-71b1511db5c697a2748c87adafe94db8ce408a8d.zip opensim-SC-71b1511db5c697a2748c87adafe94db8ce408a8d.tar.gz opensim-SC-71b1511db5c697a2748c87adafe94db8ce408a8d.tar.bz2 opensim-SC-71b1511db5c697a2748c87adafe94db8ce408a8d.tar.xz | |
Revert "Revert "I confuse myself. Let's try this variable name instead.""
This reverts commit 52dc7b2a96a28798d55d07d79d003ce5e3d35216.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/BlockingQueue.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index fb74a24..3e90fac 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs | |||
| @@ -76,10 +76,10 @@ namespace OpenSim.Framework | |||
| 76 | { | 76 | { |
| 77 | lock (m_queueSync) | 77 | lock (m_queueSync) |
| 78 | { | 78 | { |
| 79 | bool timedout = false; | 79 | bool success = true; |
| 80 | while (m_queue.Count < 1 && m_pqueue.Count < 1 && !timedout) | 80 | while (m_queue.Count < 1 && m_pqueue.Count < 1 && success) |
| 81 | { | 81 | { |
| 82 | timedout = Monitor.Wait(m_queueSync, msTimeout); | 82 | success = Monitor.Wait(m_queueSync, msTimeout); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | if (m_pqueue.Count > 0) | 85 | if (m_pqueue.Count > 0) |