make sure we drop requests if DoHTTPGruntWork fails

1 files changed, 9 insertions, 4 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 314719c..8bf98da 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -244,11 +244,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 try
                                 {
                                     req.DoHTTPGruntWork(m_server, responsedata);
-                                    byContextDequeue(req);
                                 }
-                                catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                catch (ObjectDisposedException)
                                 {
-                                    // Ignore it, no need to reply
+                                }
+                                finally
+                                {
+                                    byContextDequeue(req);
                                 }
                                 return null;
                             }, null);
@@ -263,12 +265,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                                     {
                                         req.DoHTTPGruntWork(m_server,
                                             req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                                        byContextDequeue(req);
                                     }
                                     catch (ObjectDisposedException)
                                     {
                                     // Ignore it, no need to reply
                                     }
+                                    finally
+                                    {
+                                        byContextDequeue(req);
+                                    }
                                     return null;
                                 }, null);
                             }