Used convenient method in VM

naotoj · Nov 15, 2023 · 2507506 · 2507506
1 parent ea4f9bd
commit 2507506
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/java.base/share/classes/java/nio/charset/Charset.java b/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -705,12 +705,12 @@ public static Charset defaultCharset() {
      *         If the canonical name or any of the aliases are illegal
      */
     protected Charset(String canonicalName, String[] aliases) {
-        String[] as = aliases == null ?
+        String[] as =
+            aliases == null ?
                 zeroAliases :
-                (this.getClass().getClassLoader() == null ||
-                 this.getClass().getClassLoader() == ClassLoader.getPlatformClassLoader()) ?
-                        aliases :
-                        Arrays.copyOf(aliases, aliases.length);
+                VM.isSystemDomainLoader(getClass().getClassLoader()) ?
+                    aliases :
+                    Arrays.copyOf(aliases, aliases.length);
 
         // Skip checks for the standard, built-in Charsets we always load
         // during initialization.