--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java Thu May 04 19:25:53 2017 +0000
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PropMap.java Thu May 04 15:39:09 2017 -0700
@@ -29,6 +29,8 @@
import java.io.InputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
@@ -62,12 +64,17 @@
Properties props = new Properties();
// Allow implementation selected via -Dpack.disable.native=true
+ String propValue = getPropertyValue(Utils.DEBUG_DISABLE_NATIVE, "false");
props.put(Utils.DEBUG_DISABLE_NATIVE,
- String.valueOf(Boolean.getBoolean(Utils.DEBUG_DISABLE_NATIVE)));
+ String.valueOf(Boolean.parseBoolean(propValue)));
// Set the DEBUG_VERBOSE from system
- props.put(Utils.DEBUG_VERBOSE,
- String.valueOf(Integer.getInteger(Utils.DEBUG_VERBOSE,0)));
+ int verbose = 0;
+ try {
+ verbose = Integer.decode(getPropertyValue(Utils.DEBUG_VERBOSE, "0"));
+ } catch (NumberFormatException e) {
+ }
+ props.put(Utils.DEBUG_VERBOSE, String.valueOf(verbose));
// The segment size is unlimited
props.put(Pack200.Packer.SEGMENT_LIMIT, "-1");
@@ -87,7 +94,7 @@
// Pass through files with unrecognized format by default, also
// allow system property to be set
props.put(Utils.CLASS_FORMAT_ERROR,
- System.getProperty(Utils.CLASS_FORMAT_ERROR, Pack200.Packer.PASS));
+ getPropertyValue(Utils.CLASS_FORMAT_ERROR, Pack200.Packer.PASS));
// Default effort is 5, midway between 1 and 9.
props.put(Pack200.Packer.EFFORT, "5");
@@ -97,7 +104,9 @@
// to allow override if necessary.
String propFile = "intrinsic.properties";
- try (InputStream propStr = PackerImpl.class.getResourceAsStream(propFile)) {
+ PrivilegedAction<InputStream> pa =
+ () -> PackerImpl.class.getResourceAsStream(propFile);
+ try (InputStream propStr = AccessController.doPrivileged(pa)) {
if (propStr == null) {
throw new RuntimeException(propFile + " cannot be loaded");
}
@@ -119,6 +128,12 @@
defaultProps = temp;
}
+ private static String getPropertyValue(String key, String defaultValue) {
+ PrivilegedAction<String> pa = () -> System.getProperty(key);
+ String s = AccessController.doPrivileged(pa);
+ return s != null ? s : defaultValue;
+ }
+
PropMap() {
theMap.putAll(defaultProps);
}