diff options
author | Oren Hurvitz | 2015-07-31 18:13:23 +0300 |
---|---|---|
committer | Oren Hurvitz | 2015-07-31 18:13:23 +0300 |
commit | 149cb8dcbcb78a60d972d67ef7f32a84cf79ac49 (patch) | |
tree | cde7f4a796fc26baabd060332dad85d4e0964a8a /OpenSim | |
parent | PGSQL migrations for IM_Store, UserProfiles, removal of casting exception for... (diff) | |
download | opensim-SC_OLD-149cb8dcbcb78a60d972d67ef7f32a84cf79ac49.zip opensim-SC_OLD-149cb8dcbcb78a60d972d67ef7f32a84cf79ac49.tar.gz opensim-SC_OLD-149cb8dcbcb78a60d972d67ef7f32a84cf79ac49.tar.bz2 opensim-SC_OLD-149cb8dcbcb78a60d972d67ef7f32a84cf79ac49.tar.xz |
XMLRPCModule now actually aborts the worker thread when requested
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index af3700b..87f4277 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
658 | public void Process() | 658 | public void Process() |
659 | { | 659 | { |
660 | _finished = false; | 660 | _finished = false; |
661 | WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false); | 661 | httpThread = WorkManager.StartThread(SendRequest, "HttpRequestThread", ThreadPriority.BelowNormal, true, false); |
662 | } | 662 | } |
663 | 663 | ||
664 | /* | 664 | /* |
@@ -738,7 +738,11 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
738 | { | 738 | { |
739 | try | 739 | try |
740 | { | 740 | { |
741 | httpThread.Abort(); | 741 | if (httpThread != null) |
742 | { | ||
743 | Watchdog.AbortThread(httpThread.ManagedThreadId); | ||
744 | httpThread = null; | ||
745 | } | ||
742 | } | 746 | } |
743 | catch (Exception) | 747 | catch (Exception) |
744 | { | 748 | { |