From cf2cb0946942acec06360b733a6cf3c8705b89f4 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Mar 07 2021 22:42:16 +0000
Subject: Apply patch rh1906862-always_initialise_configurator_access.patch


patch_name: rh1906862-always_initialise_configurator_access.patch
present_in_specfile: true
no_prefix: true

---

diff --git a/openjdk/jdk/src/share/classes/java/security/Security.java b/openjdk/jdk/src/share/classes/java/security/Security.java
index 84f5ab5..1c8e2a9 100644
--- a/openjdk/jdk/src/share/classes/java/security/Security.java
+++ b/openjdk/jdk/src/share/classes/java/security/Security.java
@@ -30,6 +30,8 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.io.*;
 import java.net.URL;
+import sun.misc.SharedSecrets;
+import sun.misc.JavaSecuritySystemConfiguratorAccess;
 import sun.security.util.Debug;
 import sun.security.util.PropertyExpander;
 
@@ -69,6 +71,15 @@ public final class Security {
     }
 
     static {
+        // Initialise here as used by code with system properties disabled
+        SharedSecrets.setJavaSecuritySystemConfiguratorAccess(
+            new JavaSecuritySystemConfiguratorAccess() {
+                @Override
+                public boolean isSystemFipsEnabled() {
+                    return SystemConfigurator.isSystemFipsEnabled();
+                }
+            });
+
         // doPrivileged here because there are multiple
         // things in initialize that might require privs.
         // (the FileInputStream call and the File.exists call,
diff --git a/openjdk/jdk/src/share/classes/java/security/SystemConfigurator.java b/openjdk/jdk/src/share/classes/java/security/SystemConfigurator.java
index c578a19..d5f36b0 100644
--- a/openjdk/jdk/src/share/classes/java/security/SystemConfigurator.java
+++ b/openjdk/jdk/src/share/classes/java/security/SystemConfigurator.java
@@ -39,8 +39,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import sun.misc.SharedSecrets;
-import sun.misc.JavaSecuritySystemConfiguratorAccess;
 import sun.security.util.Debug;
 
 /**
@@ -66,16 +64,6 @@ final class SystemConfigurator {
 
     private static boolean systemFipsEnabled = false;
 
-    static {
-        SharedSecrets.setJavaSecuritySystemConfiguratorAccess(
-            new JavaSecuritySystemConfiguratorAccess() {
-                @Override
-                public boolean isSystemFipsEnabled() {
-                    return SystemConfigurator.isSystemFipsEnabled();
-                }
-            });
-    }
-
     /*
      * Invoked when java.security.Security class is initialized, if
      * java.security.disableSystemPropertiesFile property is not set and