8261404: Class.getReflectionFactory() is not thread-safe

Backport-of: 905b7639424a0fa80f81f734f6fdae1b5018a14a
openjdk · Jan 29, 2024 · d7c67fc · d7c67fc · openjdk-notifier · Jan 29, 2024
1 parent 3432698
commit d7c67fc
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
@@ -3788,12 +3788,13 @@ public boolean isRecord() {
     // Fetches the factory for reflective objects
     @SuppressWarnings("removal")
     private static ReflectionFactory getReflectionFactory() {
-        if (reflectionFactory == null) {
-            reflectionFactory =
-                java.security.AccessController.doPrivileged
-                    (new ReflectionFactory.GetReflectionFactoryAction());
+        var factory = reflectionFactory;
+        if (factory != null) {
+            return factory;
         }
-        return reflectionFactory;
+        return reflectionFactory =
+                java.security.AccessController.doPrivileged
+                        (new ReflectionFactory.GetReflectionFactoryAction());
     }
     private static ReflectionFactory reflectionFactory;