src/java.base/share/classes/java/nio/charset/Charset.java

rev 17642 : 8186517: sun.nio.cs.StandardCharsets$Aliases and Classes can be lazily loaded
Reviewed-by: sherman, martin, plevart

*** 607,617 ****
                          .privilegedGetProperty("file.encoding");
                  Charset cs = lookup(csn);
                  if (cs != null)
                      defaultCharset = cs;
                  else
!                     defaultCharset = forName("UTF-8");
              }
          }
          return defaultCharset;
      }
  
--- 607,617 ----
                          .privilegedGetProperty("file.encoding");
                  Charset cs = lookup(csn);
                  if (cs != null)
                      defaultCharset = cs;
                  else
!                     defaultCharset = sun.nio.cs.UTF_8.INSTANCE;
              }
          }
          return defaultCharset;
      }
  
*** 637,651 ****
       */
      protected Charset(String canonicalName, String[] aliases) {
          String[] as = Objects.requireNonNullElse(aliases, zeroAliases);
  
          // Skip checks for the standard, built-in Charsets we always load
!         // during initialization.  Use of identity is intentional to be
!         // consistent with sun.nio.cs.StandardCharsets
!         if (canonicalName != StandardCharsets.ISO_8859_1
!                 && canonicalName != StandardCharsets.US_ASCII
!                 && canonicalName != StandardCharsets.UTF_8) {
              checkName(canonicalName);
              for (int i = 0; i < as.length; i++) {
                  checkName(as[i]);
              }
          }
--- 637,650 ----
       */
      protected Charset(String canonicalName, String[] aliases) {
          String[] as = Objects.requireNonNullElse(aliases, zeroAliases);
  
          // Skip checks for the standard, built-in Charsets we always load
!         // during initialization.
!         if (canonicalName != "ISO-8859-1"
!                 && canonicalName != "US-ASCII"
!                 && canonicalName != "UTF-8") {
              checkName(canonicalName);
              for (int i = 0; i < as.length; i++) {
                  checkName(as[i]);
              }
          }