src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java

8198481: Coding style cleanups for src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
Reviewed-by: mchung, alanb

*** 54,78 ****
      private static final AppClassLoader APP_LOADER;
  
      // Creates the built-in class loaders.
      static {
          // -Xbootclasspath/a or -javaagent with Boot-Class-Path attribute
!         String s = VM.getSavedProperty("jdk.boot.class.path.append");
!         BOOT_LOADER = new BootClassLoader((s != null && s.length() > 0)
!                                           ? new URLClassPath(s, true)
                                            : null);
          PLATFORM_LOADER = new PlatformClassLoader(BOOT_LOADER);
  
          // A class path is required when no main module is specified.
          // In this case the class path defaults to "", meaning the
          // current working directory. When a main module is specified,
          // on the contrary, we drop this historic interpretation of
          // the empty string and instead treat it as unspecified.
          String cp = System.getProperty("java.class.path");
          if (cp == null || cp.length() == 0) {
!             String mainMid = System.getProperty("jdk.module.main");
!             cp = (mainMid == null) ? "" : null;
          }
          URLClassPath ucp = new URLClassPath(cp, false);
          APP_LOADER = new AppClassLoader(PLATFORM_LOADER, ucp);
      }
  
--- 54,79 ----
      private static final AppClassLoader APP_LOADER;
  
      // Creates the built-in class loaders.
      static {
          // -Xbootclasspath/a or -javaagent with Boot-Class-Path attribute
!         String append = VM.getSavedProperty("jdk.boot.class.path.append");
!         BOOT_LOADER = new BootClassLoader(
!                 (append != null && append.length() > 0)
!                 ? new URLClassPath(append, true)
                  : null);
          PLATFORM_LOADER = new PlatformClassLoader(BOOT_LOADER);
  
          // A class path is required when no main module is specified.
          // In this case the class path defaults to "", meaning the
          // current working directory. When a main module is specified,
          // on the contrary, we drop this historic interpretation of
          // the empty string and instead treat it as unspecified.
          String cp = System.getProperty("java.class.path");
          if (cp == null || cp.length() == 0) {
!             String mainModuleName = System.getProperty("jdk.module.main");
!             cp = (mainModuleName == null) ? "" : null;
          }
          URLClassPath ucp = new URLClassPath(cp, false);
          APP_LOADER = new AppClassLoader(PLATFORM_LOADER, ucp);
      }