Merge

src/java.base/share/classes/sun/security/jca/Providers.java

@@ -26,6 +26,7 @@
 package sun.security.jca;
 
 import java.security.Provider;
+import sun.security.x509.AlgorithmId;
 
 /**
  * Collection of methods to get and set provider list. Also includes
@@ -150,7 +151,17 @@ public class Providers {
         } else {
             changeThreadProviderList(newList);
         }
+        clearCachedValues();
+    }
+
+    /**
+     * Clears the cached provider-list-specific values. These values need to
+     * be re-generated whenever provider list is changed. The logic for
+     * generating them is in the respective classes.
+     */
+    private static void clearCachedValues() {
         JCAUtil.clearDefSecureRandom();
+        AlgorithmId.clearAliasOidsTable();
     }
 
     /**

src/java.base/share/classes/sun/security/x509/AlgorithmId.java

@@ -536,6 +536,11 @@ public class AlgorithmId implements Serializable, DerEncoder {
     // oid string cache index'ed by algorithm name and oid strings
     private static volatile Map<String,String> aliasOidsTable;
 
+    // called by sun.security.jca.Providers whenever provider list is changed
+    public static void clearAliasOidsTable() {
+        aliasOidsTable = null;
+    }
+
     // returns the aliasOidsTable, lazily initializing it on first access.
     private static Map<String,String> aliasOidsTable() {
         // Double checked locking; safe because aliasOidsTable is volatile