diff options
| author | John Hurliman | 2009-10-06 10:12:59 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-06 10:12:59 -0700 |
| commit | fb19d1ca0a7c6e82c540c4e8d22c82c09b7bec98 (patch) | |
| tree | bef6315759b63e337e17d7d1e717929e08778f8c /OpenSim/Framework | |
| parent | Fixing a few compile errors in the previous commit (diff) | |
| download | opensim-SC-fb19d1ca0a7c6e82c540c4e8d22c82c09b7bec98.zip opensim-SC-fb19d1ca0a7c6e82c540c4e8d22c82c09b7bec98.tar.gz opensim-SC-fb19d1ca0a7c6e82c540c4e8d22c82c09b7bec98.tar.bz2 opensim-SC-fb19d1ca0a7c6e82c540c4e8d22c82c09b7bec98.tar.xz | |
* 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
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
| 1283 | { | 1283 | { |
| 1284 | System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState; | 1284 | System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState; |
| 1285 | 1285 | ||
| 1286 | callback.EndInvoke(ar); | 1286 | try { callback.EndInvoke(ar); } |
| 1287 | catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); } | ||
| 1288 | |||
| 1287 | ar.AsyncWaitHandle.Close(); | 1289 | ar.AsyncWaitHandle.Close(); |
| 1288 | } | 1290 | } |
| 1289 | 1291 | ||