src/java.base/share/classes/java/util/jar/JarFile.java

rev 14210 : 8154231: Simplify access to System properties from JDK code
Reviewed-by: rriggs

*** 32,42 ****
  import java.util.stream.Stream;
  import java.util.stream.StreamSupport;
  import java.util.zip.*;
  import java.security.CodeSigner;
  import java.security.cert.Certificate;
- import java.security.AccessController;
  import java.security.CodeSource;
  import jdk.internal.misc.SharedSecrets;
  import sun.security.action.GetPropertyAction;
  import sun.security.util.ManifestEntryVerifier;
  import sun.security.util.SignatureFileVerifier;
--- 32,41 ----
*** 153,172 ****
          // Set up JavaUtilJarAccess in SharedSecrets
          SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl());
  
          BASE_VERSION = 8;  // one less than lowest version for versioned entries
          int runtimeVersion = jdk.Version.current().major();
!         String jarVersion = AccessController.doPrivileged(
!                 new GetPropertyAction("jdk.util.jar.version"));
          if (jarVersion != null) {
              int jarVer = Integer.parseInt(jarVersion);
              runtimeVersion = (jarVer > runtimeVersion)
                      ? runtimeVersion : Math.max(jarVer, 0);
          }
          RUNTIME_VERSION = runtimeVersion;
!         String enableMultiRelease = AccessController.doPrivileged(
!                 new GetPropertyAction("jdk.util.jar.enableMultiRelease", "true"));
          switch (enableMultiRelease) {
              case "true":
              default:
                  MULTI_RELEASE_ENABLED = true;
                  MULTI_RELEASE_FORCED = false;
--- 152,171 ----
          // Set up JavaUtilJarAccess in SharedSecrets
          SharedSecrets.setJavaUtilJarAccess(new JavaUtilJarAccessImpl());
  
          BASE_VERSION = 8;  // one less than lowest version for versioned entries
          int runtimeVersion = jdk.Version.current().major();
!         String jarVersion =
!                 GetPropertyAction.getProperty("jdk.util.jar.version");
          if (jarVersion != null) {
              int jarVer = Integer.parseInt(jarVersion);
              runtimeVersion = (jarVer > runtimeVersion)
                      ? runtimeVersion : Math.max(jarVer, 0);
          }
          RUNTIME_VERSION = runtimeVersion;
!         String enableMultiRelease = GetPropertyAction
!                 .getProperty("jdk.util.jar.enableMultiRelease", "true");
          switch (enableMultiRelease) {
              case "true":
              default:
                  MULTI_RELEASE_ENABLED = true;
                  MULTI_RELEASE_FORCED = false;