From fb19d1ca0a7c6e82c540c4e8d22c82c09b7bec98 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 6 Oct 2009 10:12:59 -0700
Subject: * Try/catch around EndInvoke() when Util.FireAndForget() returns to
 catch exceptions thrown in the async method * Added packet stats handling to
 the new LLUDP implementation * Attempting to avoid a race condition when
 creating a new LLUDPClient

---
 OpenSim/Framework/Util.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 189fa38..38729c6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1283,7 +1283,9 @@ namespace OpenSim.Framework
         {
             System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
 
-            callback.EndInvoke(ar);
+            try { callback.EndInvoke(ar); }
+            catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); }
+
             ar.AsyncWaitHandle.Close();
         }
 
-- 
cgit v1.1