8327501: Common ForkJoinPool prevents class unloading in some cases

Reviewed-by: alanb
2024-03-07 09:44:35 +00:00 · 2024-03-07 09:44:35 +00:00 · 53c4714aab
commit 53c4714aab
parent 1261740521
1 changed files with 6 additions and 3 deletions
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@ -1140,9 +1140,12 @@ public class ForkJoinPool extends AbstractExecutorService {
            boolean isCommon = (pool.workerNamePrefix == null);
            @SuppressWarnings("removal")
            SecurityManager sm = System.getSecurityManager();
-            if (sm == null)
-                return new ForkJoinWorkerThread(null, pool, true, false);
-            else if (isCommon)
+            if (sm == null) {
+                if (isCommon)
+                    return new ForkJoinWorkerThread.InnocuousForkJoinWorkerThread(pool);
+                else
+                    return new ForkJoinWorkerThread(null, pool, true, false);
+            } else if (isCommon)
                return newCommonWithACC(pool);
            else
                return newRegularWithACC(pool);