Merge remote-tracking branch 'origin/master' into jetty-9.1

Conflicts:
	tests/test-webapps/test-jetty-webapp/src/main/webapp/remote.html
This commit is contained in:
Greg Wilkins 2013-11-11 14:08:25 +11:00
commit f951b8f979
1 changed files with 3 additions and 1 deletions

View File

@ -528,12 +528,14 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
startThreads(1);
}
while (isRunning())
loop: while (isRunning())
{
// Job loop
while (job != null && isRunning())
{
runJob(job);
if (Thread.interrupted())
break loop;
job = _jobs.poll();
}