1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8211860: Avoid reading security properties eagerly on Manifest class initialization

Browse Source 
Reviewed-by: mullan, alanb
This commit is contained in:
Claes Redestad 2018-10-08 18:16:03 +02:00
parent 8791ea8dc0
commit d5d74f0e26
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java.base/share/classes/java/util/jar/Manifest.java
View File

@ -49,9 +49,6 @@ import sun.security.util.SecurityProperties;
*/ */
public class Manifest implements Cloneable { public class Manifest implements Cloneable {
private static final boolean jarInfoInExceptionText =
SecurityProperties.includedInExceptions("jar");
// manifest main attributes // manifest main attributes
private Attributes attr = new Attributes(); private Attributes attr = new Attributes();
@ -203,10 +200,10 @@ public class Manifest implements Cloneable {
} }
static String getErrorPosition(String filename, final int lineNumber) { static String getErrorPosition(String filename, final int lineNumber) {
if (filename == null || !jarInfoInExceptionText) { if (filename == null ||
!SecurityProperties.INCLUDE_JAR_NAME_IN_EXCEPTIONS) {
return "line " + lineNumber; return "line " + lineNumber;
} }
return "manifest of " + filename + ":" + lineNumber; return "manifest of " + filename + ":" + lineNumber;
} }

3
src/java.base/share/classes/sun/security/util/SecurityProperties.java
View File

@ -32,6 +32,9 @@ import java.security.Security;
public class SecurityProperties { public class SecurityProperties {
public static final boolean INCLUDE_JAR_NAME_IN_EXCEPTIONS
= includedInExceptions("jar");
/** /**
* Returns the value of the security property propName, which can be overridden * Returns the value of the security property propName, which can be overridden
* by a system property of the same name * by a system property of the same name