Skip to content

Commit fc0e5c3

Browse files
committed
RH2021263: Make sure java.security.Security is initialised when retrieving JavaSecuritySystemConfiguratorAccess instance
1 parent 4f9c891 commit fc0e5c3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.io.ObjectInputStream;
3737
import java.io.RandomAccessFile;
3838
import java.security.ProtectionDomain;
39+
import java.security.Security;
3940
import java.security.Signature;
4041

4142
/** A repository of "shared secrets", which are a mechanism for
@@ -368,6 +369,9 @@ public static void setJavaSecuritySystemConfiguratorAccess(JavaSecuritySystemCon
368369
}
369370

370371
public static JavaSecuritySystemConfiguratorAccess getJavaSecuritySystemConfiguratorAccess() {
372+
if (javaSecuritySystemConfiguratorAccess == null) {
373+
unsafe.ensureClassInitialized(Security.class);
374+
}
371375
return javaSecuritySystemConfiguratorAccess;
372376
}
373377
}

0 commit comments

Comments
 (0)