From 71278919575b0e0222cdbe3c0cefa5919f9a75bc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 17 Jul 2013 15:04:27 -0700
Subject: Revert "Putting the requests back in the queue while testing for
 count >0 is not the smartest move..."

This reverts commit f4317dc26d670c853d0ea64b401b00f718f09474.
---
 .../Framework/Servers/HttpServer/PollServiceRequestManager.cs  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Framework/Servers')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c50df5a..4cb551c 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -126,22 +126,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                 Thread.Sleep(1000); 
                 Watchdog.UpdateThread();
 
-                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
+                PollServiceHttpRequest req;
                 lock (m_longPollRequests)
                 {
                     while (m_longPollRequests.Count > 0 && m_running)
                     {
-                        PollServiceHttpRequest req = m_longPollRequests.Dequeue();
+                        req = m_longPollRequests.Dequeue();
                         if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
                             (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
                             m_requests.Enqueue(req);
                         else
-                            not_ready.Add(req);
+                            m_longPollRequests.Enqueue(req);
                     }
-
-                    foreach (PollServiceHttpRequest req in not_ready)
-                        m_longPollRequests.Enqueue(req);
-
                 }
             }
         }
-- 
cgit v1.1