summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-08-26 17:48:47 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-08-26 17:55:56 +0200
commit1c91379665948e66384305507c95ed6c3b1a78e1 (patch)
treeae5c6cd983fcafaf7ac64aa8c33ec6f79842c074 /cpp/src/Ice/ThreadPool.cpp
parentRemoved work-around for OpenSSL error on AIX, as it's no longer needed with O... (diff)
downloadice-1c91379665948e66384305507c95ed6c3b1a78e1.tar.bz2
ice-1c91379665948e66384305507c95ed6c3b1a78e1.tar.xz
ice-1c91379665948e66384305507c95ed6c3b1a78e1.zip
Fixed C++/Java thread pool to no longer print bogus warning on shutdown, fixes #496
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index bbd8b49d087..1479b79de90 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -678,6 +678,9 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
}
catch(const ThreadPoolDestroyedException&)
{
+ Lock sync(*this);
+ --_inUse;
+ thread->setState(ICE_ENUM(ThreadState, ThreadStateIdle));
return;
}
catch(const exception& ex)