Merge pull request #6 from jerboaa/JDK-8328366-fork-join-pool-backport

Backport: svm: adopt "JDK-8328366: Thread.setContextClassloader from thread in FJP commonPool task no longer works after JDK-8327501"
graalvm · Aug 22, 2024 · 7ff5518 · 7ff5518
2 parents 18ee945 + dab7d02
commit 7ff5518
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21u3OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21u3OrEarlier.java
@@ -31,7 +31,7 @@
 public class JDK21u3OrEarlier implements BooleanSupplier {
 
     public static final boolean jdk21u3OrEarlier = JavaVersionUtil.JAVA_SPEC < 21 ||
-            (JavaVersionUtil.JAVA_SPEC == 21 && Runtime.version().update() <= 3);
+                    (JavaVersionUtil.JAVA_SPEC == 21 && Runtime.version().update() <= 3);
 
     @Override
     public boolean getAsBoolean() {

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21u4OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21u4OrLater.java
@@ -31,7 +31,7 @@
 public class JDK21u4OrLater implements BooleanSupplier {
 
     public static final boolean jdk21u4OrLater = JavaVersionUtil.JAVA_SPEC > 21 ||
-            (JavaVersionUtil.JAVA_SPEC == 21 && Runtime.version().update() >= 4);
+                    (JavaVersionUtil.JAVA_SPEC == 21 && Runtime.version().update() >= 4);
 
     @Override
     public boolean getAsBoolean() {

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RecomputedFields.java
@@ -33,6 +33,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.charset.CharsetDecoder;
+import java.security.AccessControlContext;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ForkJoinPool;
@@ -386,6 +387,15 @@ private static synchronized ForkJoinPool initializeCommonPool() {
     }
 }
 
+@TargetClass(value = java.util.concurrent.ForkJoinPool.class, innerClass = "DefaultForkJoinWorkerThreadFactory", onlyWith = JDK21OrLater.class)
+@SuppressWarnings("removal")
+final class Target_java_util_concurrent_ForkJoinPool_DefaultForkJoinWorkerThreadFactory {
+    @Alias @RecomputeFieldValue(kind = Reset) //
+    static AccessControlContext regularACC;
+    @Alias @RecomputeFieldValue(kind = Reset) //
+    static AccessControlContext commonACC;
+}
+
 /** Dummy class to have a class with the file's name. */
 public final class RecomputedFields {
 }