Merge pull request #6171

bdcf5de Fix intermittent hang issue in scheduler_tests (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2015-05-21 21:59:56 +02:00
commit 4bf83b27b2
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -29,8 +29,6 @@ void CScheduler::serviceQueue()
{
boost::unique_lock<boost::mutex> lock(newTaskMutex);
++nThreadsServicingQueue;
stopRequested = false;
stopWhenEmpty = false;
// newTaskMutex is locked throughout this loop EXCEPT
// when the thread is waiting or when the user's function