aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-25 22:51:23 +0100
committerJustin Clark-Casey (justincc)2011-10-25 22:51:23 +0100
commite549f2f443bdf1e711d02dbd7d1977e0c296b1df (patch)
tree0c7a9be6418adebfd4d4f2bc6c55717c26ff9a7c
parentClear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from... (diff)
downloadopensim-SC_OLD-e549f2f443bdf1e711d02dbd7d1977e0c296b1df.zip
opensim-SC_OLD-e549f2f443bdf1e711d02dbd7d1977e0c296b1df.tar.gz
opensim-SC_OLD-e549f2f443bdf1e711d02dbd7d1977e0c296b1df.tar.bz2
opensim-SC_OLD-e549f2f443bdf1e711d02dbd7d1977e0c296b1df.tar.xz
Add m_threads dictionary locking to Watchdog.GetThreads()
-rw-r--r--OpenSim/Framework/Watchdog.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index c947ea6..3ef9ccb 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -178,7 +178,8 @@ namespace OpenSim.Framework
178 /// <returns></returns> 178 /// <returns></returns>
179 public static ThreadWatchdogInfo[] GetThreads() 179 public static ThreadWatchdogInfo[] GetThreads()
180 { 180 {
181 return m_threads.Values.ToArray(); 181 lock (m_threads)
182 return m_threads.Values.ToArray();
182 } 183 }
183 184
184 private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e) 185 private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)