summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ThreadPool.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
-rw-r--r--cpp/src/Ice/ThreadPool.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 3834d0898dc..ec61063885b 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -995,13 +995,14 @@ IceInternal::ThreadPool::followerWait(const IceUtil::ThreadPtr& thread, ThreadPo
//
// Wait to be promoted and for all the IO threads to be done.
//
- while(!_promote || _inUseIO == _sizeIO || _nextHandler == _handlers.end() && _inUseIO > 0)
+ while(!_promote || _inUseIO == _sizeIO || (_nextHandler == _handlers.end() && _inUseIO > 0))
{
if(_threadIdleTime)
{
if(!timedWait(IceUtil::Time::seconds(_threadIdleTime)))
{
- if(!_destroyed && (!_promote || _inUseIO == _sizeIO || _nextHandler == _handlers.end() && _inUseIO > 0))
+ if(!_destroyed && (!_promote || _inUseIO == _sizeIO ||
+ (_nextHandler == _handlers.end() && _inUseIO > 0)))
{
if(_instance->traceLevels()->threadPool >= 1)
{