diff options
author | Matthew Newhook <matthew@zeroc.com> | 2014-10-02 16:45:39 -0230 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2014-10-02 16:45:39 -0230 |
commit | 4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291 (patch) | |
tree | 2d9c1f2761bdfc78526d2cabbca9c9d5f445a3bd /cpp/src/Ice/ThreadPool.cpp | |
parent | ICE-5585 call callback from ThreadPool if conneciton already closed (diff) | |
download | ice-4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291.tar.bz2 ice-4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291.tar.xz ice-4dbbe4e02d903abb8a7c7e234c36e1ba4c1e2291.zip |
Cleanup and simplification of OA in C++/Java/C#.
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index a1bb3ab424e..1db49555d9e 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -524,7 +524,11 @@ void IceInternal::ThreadPool::destroy() { Lock sync(*this); - assert(!_destroyed); + if(_destroyed) + { + return; + } + _destroyed = true; _workQueue->destroy(); } |