diff options
| author | Diva Canto | 2013-07-17 15:03:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-17 15:03:16 -0700 |
| commit | 519dba9a69a02980e09268671c030017001a2cd4 (patch) | |
| tree | 36889ae742efcbf0017efc0abd0bc8ecd995fbfd | |
| parent | Revert "This is a completely unreasonable thing to do, effectively defying th... (diff) | |
| download | opensim-SC_OLD-519dba9a69a02980e09268671c030017001a2cd4.zip opensim-SC_OLD-519dba9a69a02980e09268671c030017001a2cd4.tar.gz opensim-SC_OLD-519dba9a69a02980e09268671c030017001a2cd4.tar.bz2 opensim-SC_OLD-519dba9a69a02980e09268671c030017001a2cd4.tar.xz | |
Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager."
This reverts commit 5f95f4d78e8c7d17b8ba866907156fe6d4444c04.
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index bad28e4..c50df5a 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 46 | 46 | ||
| 47 | private readonly BaseHttpServer m_server; | 47 | private readonly BaseHttpServer m_server; |
| 48 | 48 | ||
| 49 | private DoubleQueue<PollServiceHttpRequest> m_requests = new DoubleQueue<PollServiceHttpRequest>(); | 49 | private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>(); |
| 50 | private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>(); | 50 | private static Queue<PollServiceHttpRequest> m_longPollRequests = new Queue<PollServiceHttpRequest>(); |
| 51 | 51 | ||
| 52 | private uint m_WorkerThreadCount = 0; | 52 | private uint m_WorkerThreadCount = 0; |
| @@ -163,7 +163,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 163 | m_requests.Enqueue(m_longPollRequests.Dequeue()); | 163 | m_requests.Enqueue(m_longPollRequests.Dequeue()); |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | while (m_requests.Count > 0) | 166 | while (m_requests.Count() > 0) |
| 167 | { | 167 | { |
| 168 | try | 168 | try |
| 169 | { | 169 | { |