Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent bd7930416e 16d22828fd
commit f951b8f979
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
View File

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