OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XMLRPCModule now actually aborts the worker thread when requested

0.8.2-post-fixes
Oren Hurvitz 2015-07-31 18:13:23 +03:00
parent 1de8c3570d
commit 149cb8dcbc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
View File

@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
public void Process() public void Process()
{ {
_finished = false; _finished = false;
WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false); httpThread = WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false);
} }
/* /*
@ -738,7 +738,11 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
{ {
try try
{ {
httpThread.Abort(); if (httpThread != null)
{
Watchdog.AbortThread(httpThread.ManagedThreadId);
httpThread = null;
}
} }
catch (Exception) catch (Exception)
{ {