diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index eaffe3f..aa7e3e9 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | |||
@@ -233,15 +233,15 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
233 | if (eventQueueThreads != null && eventQueueThreads != null) | 233 | if (eventQueueThreads != null && eventQueueThreads != null) |
234 | { | 234 | { |
235 | // Kill worker threads | 235 | // Kill worker threads |
236 | lock (eventQueueThreads) | 236 | //lock (eventQueueThreads) |
237 | { | 237 | //{ |
238 | foreach (EventQueueThreadClass EventQueueThread in eventQueueThreads) | 238 | foreach (EventQueueThreadClass EventQueueThread in new ArrayList(eventQueueThreads)) |
239 | { | 239 | { |
240 | AbortThreadClass(EventQueueThread); | 240 | AbortThreadClass(EventQueueThread); |
241 | } | 241 | } |
242 | eventQueueThreads.Clear(); | 242 | //eventQueueThreads.Clear(); |
243 | staticGlobalEventQueueThreads.Clear(); | 243 | //staticGlobalEventQueueThreads.Clear(); |
244 | } | 244 | //} |
245 | } | 245 | } |
246 | 246 | ||
247 | // Remove all entries from our event queue | 247 | // Remove all entries from our event queue |
@@ -275,10 +275,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
275 | } | 275 | } |
276 | catch (Exception ex) | 276 | catch (Exception ex) |
277 | { | 277 | { |
278 | m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:"); | 278 | //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: If you see this, could you please report it to Tedd:"); |
279 | m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString()); | 279 | //m_ScriptEngine.Log.Error("[" + m_ScriptEngine.ScriptEngineName + ":EventQueueManager]: Script thread execution timeout kill ended in exception: " + ex.ToString()); |
280 | } | 280 | } |
281 | m_ScriptEngine.Log.Debug("[" + m_ScriptEngine.ScriptEngineName + "]: Killed script execution thread. Remaining thread count: " + eventQueueThreads.Count); | 281 | //m_ScriptEngine.Log.Debug("[" + m_ScriptEngine.ScriptEngineName + "]: Killed script execution thread. Remaining thread count: " + eventQueueThreads.Count); |
282 | } | 282 | } |
283 | #endregion | 283 | #endregion |
284 | 284 | ||