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

Issue #3494 - QueuedThreadPool bug - jobs disappearing on lifecycle stop. 

Small fixes after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2019-04-05 08:36:18 +02:00
parent 3dd58fae22
commit a982422b40
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,7 +697,6 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
if (job != null && _threadsIdle.get() == 0) if (job != null && _threadsIdle.get() == 0)
startThreads(1); startThreads(1);
loop:
while (true) while (true)
{ {
if (job == null) if (job == null)
@ -721,7 +720,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
if (last == 0 || (now - last) > TimeUnit.MILLISECONDS.toNanos(_idleTimeout)) if (last == 0 || (now - last) > TimeUnit.MILLISECONDS.toNanos(_idleTimeout))
{ {
if (_lastShrink.compareAndSet(last, now)) if (_lastShrink.compareAndSet(last, now))
break loop; break;
} }
} }
@ -750,7 +749,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
} }
if (!isRunning()) if (!isRunning())
break loop; break;
job = _jobs.poll(); job = _jobs.poll();
} }
@ -761,8 +760,7 @@ public class QueuedThreadPool extends ContainerLifeCycle implements SizedThreadP
} }
catch (Throwable e) catch (Throwable e)
{ {
LOG.warn("Unexpected thread death: {} in {}", this, QueuedThreadPool.this); LOG.warn(String.format("Unexpected thread death: %s in %s", this, QueuedThreadPool.this), e);
LOG.warn(e);
} }
finally finally
{ {