Merge pull request #5995 from eclipse/jetty-9.4.x-5994-qtp_free_threads

Fixes #5994 - QueuedThreadPool "free" threads
jetty · Feb 24, 2021 · c9cd1e4 · c9cd1e4
2 parents 8bd4a9f + 530c14e
commit c9cd1e4
Show file tree

Hide file tree

Showing 5 changed files with 391 additions and 174 deletions.
diff --git a/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerLifeCycleTest.java b/jetty-jmx/src/test/java/org/eclipse/jetty/jmx/MBeanContainerLifeCycleTest.java
@@ -77,12 +77,13 @@ public void testStoppingContainerDoesNotUnregistersMBeans() throws Exception
 
         String pkg = bean.getClass().getPackage().getName();
         Set<ObjectName> objectNames = mbeanServer.queryNames(ObjectName.getInstance(pkg + ":*"), null);
-        assertEquals(1, objectNames.size());
+        // QueuedThreadPool and ThreadPoolBudget.
+        assertEquals(2, objectNames.size());
 
         container.stop();
 
         objectNames = mbeanServer.queryNames(ObjectName.getInstance(pkg + ":*"), null);
-        assertEquals(1, objectNames.size());
+        assertEquals(2, objectNames.size());
 
         // Remove the MBeans to start clean on the next test.
         objectNames.forEach(objectName ->
@@ -105,7 +106,8 @@ public void testDestroyingContainerUnregistersMBeans() throws Exception
 
         String pkg = bean.getClass().getPackage().getName();
         Set<ObjectName> objectNames = mbeanServer.queryNames(ObjectName.getInstance(pkg + ":*"), null);
-        assertEquals(1, objectNames.size());
+        // QueuedThreadPool and ThreadPoolBudget.
+        assertEquals(2, objectNames.size());
 
         container.stop();
         container.destroy();