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.

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.
  *
@@ -229,9 +229,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             PollServiceHttpRequest req;
             while (m_running)
+            {
+                try
                 {
                     req = null;
-                if(!m_requests.TryTake(out req, 4500) || req == null)
+                    if (!m_requests.TryTake(out req, 4500) || req == null)
                     {
                         Watchdog.UpdateThread();
                         continue;
@@ -239,16 +241,14 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                     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)
                         {
@@ -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());

OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs

@@ -203,11 +203,13 @@ namespace OpenSim.Region.ClientStack.Linden
         #endregion
 
         private static void DoAssetRequests()
+        {
+            try
             {
                 while (m_NumberScenes > 0)
                 {
                     APollRequest poolreq;
-                if(m_queue.TryTake(out poolreq, 4500))
+                    if (m_queue.TryTake(out poolreq, 4500))
                     {
                         if (m_NumberScenes <= 0)
                             break;
@@ -219,6 +221,11 @@ namespace OpenSim.Region.ClientStack.Linden
                     Watchdog.UpdateThread();
                 }
             }
+            catch (ThreadAbortException)
+            {
+                Thread.ResetAbort();
+            }
+        }
 
         private class PollServiceAssetEventArgs : PollServiceEventArgs
         {

OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs

@@ -395,7 +395,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private static void DoInventoryRequests()
         {
-            while (true)
+            bool running = true;
+            while (running)
+            {
+                try
                 {
                     APollRequest poolreq;
                     if (m_queue.TryTake(out poolreq, 4500))
@@ -407,6 +410,12 @@ namespace OpenSim.Region.ClientStack.Linden
                     }
                     Watchdog.UpdateThread();
                 }
+                catch (ThreadAbortException)
+                {
+                    Thread.ResetAbort();
+                    running = false;
+                }
+            }
         }
     }
 }

OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

@@ -1910,7 +1910,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         incomingPacket = null;
                     }
                 }
-                catch(Exception ex)
+                catch (ThreadAbortException)
+                {
+                    Thread.ResetAbort();
+                }
+                catch (Exception ex)
                 {
                     m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex);
                 }

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs

@@ -221,7 +221,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// </summary>
         private static void CmdHandlerThreadLoop()
         {
-            while (true)
+            bool running = true;
+            while (running)
             {
                 try
                 {
@@ -230,7 +231,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     DoOneCmdHandlerPass();
                     Watchdog.UpdateThread();
                 }
-                catch ( System.Threading.ThreadAbortException) { }
+                catch ( System.Threading.ThreadAbortException)
+                {
+                    Thread.ResetAbort();
+                    running = false;
+                }
                 catch (Exception e)
                 {
                     m_log.Error("[ASYNC COMMAND MANAGER]: Exception in command handler pass: ", e);