If a FireAndForget thread terminates with an exception, then catch and log rather than letting it terminate the simulator.

Exceptions don't appear to do this with the SmartThreadPool but they do with UnsafeQueueUserWorkItem (and maybe others)

1 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 51ced7b..745da17 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1508,7 +1508,21 @@ namespace OpenSim.Framework
             // When OpenSim interacts with a database or sends data over the wire, it must send this in en_US culture
             // so that we don't encounter problems where, for instance, data is saved with a culture that uses commas
             // for decimals places but is read by a culture that treats commas as number seperators.
-            WaitCallback realCallback = delegate(object o) { Culture.SetCurrentCulture(); callback(o); };
+            WaitCallback realCallback = delegate(object o)
+            {
+                Culture.SetCurrentCulture();
+
+                try
+                {
+                    callback(o);
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[UTIL]: Continuing after async_call_method thread terminated with exception {0}{1}",
+                        e.Message, e.StackTrace);
+                }
+            };
 
             switch (FireAndForgetMethod)
             {