From e549f2f443bdf1e711d02dbd7d1977e0c296b1df Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Oct 2011 22:51:23 +0100
Subject: Add m_threads dictionary locking to Watchdog.GetThreads()
---
OpenSim/Framework/Watchdog.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
/// <returns></returns>
public static ThreadWatchdogInfo[] GetThreads()
{
- return m_threads.Values.ToArray();
+ lock (m_threads)
+ return m_threads.Values.ToArray();
}
private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
--
cgit v1.1