Issue jetty#7650 - Fix race condition when stopping QueuedThreadPool

Signed-off-by: Dominik Zöchbauer <dominik@zoechbauer.info>
dzoech · Feb 3, 2023 · 4c2bbb6 · 4c2bbb6
1 parent 2f431ff
commit 4c2bbb6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
@@ -280,9 +280,11 @@ protected void doStop() throws Exception
         }
 
         // Close any un-executed jobs
-        while (!_jobs.isEmpty())
-        {
+        while (true) {
             Runnable job = _jobs.poll();
+            if (job == null) {
+                break;
+            }
             if (job instanceof Closeable)
             {
                 try