Merge pull request #6171

laanwj · laanwj · commit 4bf83b27b282 · 2015-05-21T22:00:07.000+02:00
bdcf5de Fix intermittent hang issue in scheduler_tests (Wladimir J. van der Laan)
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ void CScheduler::serviceQueue()`
`29`	`29`	`{`
`30`	`30`	`boost::unique_lock<boost::mutex> lock(newTaskMutex);`
`31`	`31`	`++nThreadsServicingQueue;`
`32`		`- stopRequested = false;`
`33`		`- stopWhenEmpty = false;`
`34`	`32`
`35`	`33`	`// newTaskMutex is locked throughout this loop EXCEPT`
`36`	`34`	`// when the thread is waiting or when the user's function`