Add Thread.ResetAbort() to various thread loops to clean up errors on

shutdown. Fixes Mantis #8494.

Threads are aborted when shutting down and ThreadAbortException is odd
in that it is rethrown at the end of the catch unless the abort is
reset. No functional changes but fewer error messages on shutdown.

1 files changed, 19 insertions, 13 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index b9ac155..14e21a2 100644..100755
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -230,25 +230,25 @@ namespace OpenSim.Framework.Servers.HttpServer
             PollServiceHttpRequest req;
             while (m_running)
             {
-                req = null;
-                if(!m_requests.TryTake(out req, 4500) || req == null)
+                try
                 {
-                    Watchdog.UpdateThread();
-                    continue;
-                }
+                    req = null;
+                    if (!m_requests.TryTake(out req, 4500) || req == null)
+                    {
+                        Watchdog.UpdateThread();
+                        continue;
+                    }
 
-                Watchdog.UpdateThread();
+                    Watchdog.UpdateThread();
 
-                try
-                {
-                    if(!req.HttpContext.CanSend())
+                    if (!req.HttpContext.CanSend())
                     {
                         req.PollServiceArgs.Drop(req.RequestID, req.PollServiceArgs.Id);
                         byContextDequeue(req);
                         continue;
                     }
 
-                    if(req.HttpContext.IsSending())
+                    if (req.HttpContext.IsSending())
                     {
                         if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
                         {
@@ -256,7 +256,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             byContextDequeue(req);
                         }
                         else
-                          ReQueueEvent(req);
+                            ReQueueEvent(req);
                         continue;
                     }
 
@@ -290,7 +290,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 {
                                     nreq.DoHTTPGruntWork(nreq.PollServiceArgs.NoEvents(nreq.RequestID, nreq.PollServiceArgs.Id));
                                 }
-                                catch (ObjectDisposedException) {}
+                                catch (ObjectDisposedException) { }
                                 finally
                                 {
                                     byContextDequeue(nreq);
@@ -305,6 +305,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                     }
                 }
+                catch (ThreadAbortException)
+                {
+                    Thread.ResetAbort();
+                    // Shouldn't set this to 'false', the normal shutdown should cause things to exit
+                    // m_running = false;
+                }
                 catch (Exception e)
                 {
                     m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());