Merge openj9 into openj9-staging

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
ibmruntimes · Sep 20, 2024 · 7dbd3e5 · 7dbd3e5
2 parents 7fa4849 + b3b8db9
commit 7dbd3e5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/java.base/share/classes/sun/security/jca/Providers.java b/src/java.base/share/classes/sun/security/jca/Providers.java
@@ -56,14 +56,6 @@ public class Providers {
  // Note volatile immutable object, so no synchronization needed.
  private static volatile ProviderList providerList;
 
- static {
- // set providerList to empty list first in case initialization somehow
- // triggers a getInstance() call (although that should not happen)
- providerList = ProviderList.EMPTY;
- providerList = ProviderList.fromSecurityProperties();
- RestrictedSecurity.checkHashValues();
- }
-
  private Providers() {
  // empty
  }
@@ -114,6 +106,14 @@ private Providers() {
  "com.sun.crypto.provider.SunJCE",
  };
 
+ static {
+ // set providerList to empty list first in case initialization somehow
+ // triggers a getInstance() call (although that should not happen)
+ providerList = ProviderList.EMPTY;
+ providerList = ProviderList.fromSecurityProperties();
+ RestrictedSecurity.checkHashValues();
+ }
+
  // Return Sun provider.
  // This method should only be called by
  // sun.security.util.ManifestEntryVerifier and java.security.SecureRandom.