Used convenient method in VM

naotoj · Nov 15, 2023 · e8a7ec4 · e8a7ec4
1 parent ea4f9bd
commit e8a7ec4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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.

diff --git a/test/jdk/java/nio/charset/Charset/AliasesCopy.java b/test/jdk/java/nio/charset/Charset/AliasesCopy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) , 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it