aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty
diff options
context:
space:
mode:
authorMelanie2010-06-02 17:41:28 +0100
committerMelanie2010-06-02 17:41:28 +0100
commit698066d7e3a59281b6b1caa499ad32ff389c8bb6 (patch)
treee87d6815137c10304e83610dbda18ed23b57027a /ThirdParty
parentRevert "After aborting a thread, wait for it to actually finish. EXPERIMENTAL... (diff)
downloadopensim-SC-698066d7e3a59281b6b1caa499ad32ff389c8bb6.zip
opensim-SC-698066d7e3a59281b6b1caa499ad32ff389c8bb6.tar.gz
opensim-SC-698066d7e3a59281b6b1caa499ad32ff389c8bb6.tar.bz2
opensim-SC-698066d7e3a59281b6b1caa499ad32ff389c8bb6.tar.xz
Next OSG TEST RELEASE. Join aborted threads.
Diffstat (limited to 'ThirdParty')
-rw-r--r--ThirdParty/SmartThreadPool/WorkItem.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/ThirdParty/SmartThreadPool/WorkItem.cs b/ThirdParty/SmartThreadPool/WorkItem.cs
index d0c0524..12668b0 100644
--- a/ThirdParty/SmartThreadPool/WorkItem.cs
+++ b/ThirdParty/SmartThreadPool/WorkItem.cs
@@ -1027,7 +1027,10 @@ namespace Amib.Threading.Internal
1027 lock (this) 1027 lock (this)
1028 { 1028 {
1029 if(currentThread != null) 1029 if(currentThread != null)
1030 {
1030 currentThread.Abort(); 1031 currentThread.Abort();
1032 currentThread.Join();
1033 }
1031 } 1034 }
1032 } 1035 }
1033 } 1036 }