Issue jetty#7650 - Fix race condition when stopping QueuedThreadPool

Signed-off-by: Dominik Zöchbauer <dominik@zoechbauer.info>
dzoech · Feb 7, 2023 · 12d6a52 · 12d6a52
1 parent 0a4a077
commit 12d6a52
Showing 1 changed file with 5 additions and 1 deletion.
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
@@ -288,9 +288,13 @@ 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