diff options
| author | UbitUmarov | 2016-11-19 15:45:41 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-19 15:45:41 +0000 |
| commit | 7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4 (patch) | |
| tree | a2ab69bce5eda122b119da082625449f92b4c3d3 /ThirdParty | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | REST console v2. This is an incompatible protocol change. It degrades gracefu... (diff) | |
| download | opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.zip opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.gz opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.bz2 opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.xz | |
merge conflits
Diffstat (limited to 'ThirdParty')
| -rw-r--r-- | ThirdParty/SmartThreadPool/WorkItemsQueue.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs index e0bc916..019c0d3 100644 --- a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs +++ b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs | |||
| @@ -625,6 +625,7 @@ namespace Amib.Threading.Internal | |||
| 625 | if (!_isDisposed) | 625 | if (!_isDisposed) |
| 626 | { | 626 | { |
| 627 | Cleanup(); | 627 | Cleanup(); |
| 628 | _headWaiterEntry.Close(); | ||
| 628 | } | 629 | } |
| 629 | _isDisposed = true; | 630 | _isDisposed = true; |
| 630 | } | 631 | } |