diff options
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index ffc6ad3..415c264 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
@@ -207,7 +207,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
207 | qu.Clear(); | 207 | qu.Clear(); |
208 | m_bycontext.Clear(); | 208 | m_bycontext.Clear(); |
209 | 209 | ||
210 | /* | ||
211 | try | 210 | try |
212 | { | 211 | { |
213 | foreach (PollServiceHttpRequest req in m_retryRequests) | 212 | foreach (PollServiceHttpRequest req in m_retryRequests) |
@@ -220,22 +219,21 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
220 | } | 219 | } |
221 | 220 | ||
222 | PollServiceHttpRequest wreq; | 221 | PollServiceHttpRequest wreq; |
223 | */ | 222 | |
224 | m_retryRequests.Clear(); | 223 | m_retryRequests.Clear(); |
225 | /* | 224 | |
226 | while (m_requests.Count() > 0) | 225 | while (m_requests.Count() > 0) |
227 | { | 226 | { |
228 | try | 227 | try |
229 | { | 228 | { |
230 | wreq = m_requests.Dequeue(0); | 229 | wreq = m_requests.Dequeue(0); |
231 | wreq.DoHTTPstop(m_server); | 230 | wreq.DoHTTPstop(m_server); |
232 | |||
233 | } | 231 | } |
234 | catch | 232 | catch |
235 | { | 233 | { |
236 | } | 234 | } |
237 | } | 235 | } |
238 | */ | 236 | |
239 | m_requests.Clear(); | 237 | m_requests.Clear(); |
240 | } | 238 | } |
241 | 239 | ||
@@ -245,7 +243,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
245 | { | 243 | { |
246 | while (m_running) | 244 | while (m_running) |
247 | { | 245 | { |
248 | PollServiceHttpRequest req = m_requests.Dequeue(5000); | 246 | PollServiceHttpRequest req = m_requests.Dequeue(4500); |
249 | Watchdog.UpdateThread(); | 247 | Watchdog.UpdateThread(); |
250 | if(req == null) | 248 | if(req == null) |
251 | continue; | 249 | continue; |