From baebefeb05f3bfb3ab44a93490649e55c659e66d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 8 Jul 2010 16:30:36 +0100
Subject: Handle a specific exception without spewing red ink.

---
 .../Servers/HttpServer/PollServiceWorkerThread.cs         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 1cc19c5..b91496b 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -73,7 +73,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
                     {
-                        StreamReader str = new StreamReader(req.Request.Body);
+                        StreamReader str;
+                        try
+                        {
+                            str = new StreamReader(req.Request.Body);
+                        }
+                        catch (System.ArgumentException)
+                        {
+                            // Stream was not readable means a child agent
+                            // was closed due to logout, leaving the
+                            // Event Queue request orphaned.
+                            continue;
+                        }
 
                         Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
                         m_server.DoHTTPGruntWork(responsedata,
@@ -106,4 +117,4 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_request.Enqueue(pPollServiceHttpRequest);
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1