diff options
author | UbitUmarov | 2016-09-03 07:51:53 +0100 |
---|---|---|
committer | UbitUmarov | 2016-09-03 07:51:53 +0100 |
commit | 9aec227767cf726216514d0494f11b5d8bf5b807 (patch) | |
tree | 8f308f4c1eefa19954fc30a560ac780f8a8e916a /ThirdParty | |
parent | merge issue (diff) | |
parent | tests making sure evering thing is coerently wrong.. (diff) | |
download | opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.zip opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.gz opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.bz2 opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'ThirdParty')
-rw-r--r-- | ThirdParty/SmartThreadPool/SmartThreadPool.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.cs index 9043d3a..297e20e 100644 --- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs +++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs | |||
@@ -1485,6 +1485,9 @@ namespace Amib.Threading | |||
1485 | _isIdleWaitHandle = null; | 1485 | _isIdleWaitHandle = null; |
1486 | } | 1486 | } |
1487 | 1487 | ||
1488 | if (_stpStartInfo.EnableLocalPerformanceCounters) | ||
1489 | _localPCs.Dispose(); | ||
1490 | |||
1488 | _isDisposed = true; | 1491 | _isDisposed = true; |
1489 | } | 1492 | } |
1490 | } | 1493 | } |
@@ -1684,6 +1687,7 @@ namespace Amib.Threading | |||
1684 | } | 1687 | } |
1685 | workItemsGroup.Start(); | 1688 | workItemsGroup.Start(); |
1686 | anActionCompleted.WaitOne(); | 1689 | anActionCompleted.WaitOne(); |
1690 | anActionCompleted.Dispose(); | ||
1687 | 1691 | ||
1688 | return choiceIndex._index; | 1692 | return choiceIndex._index; |
1689 | } | 1693 | } |