--- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java Tue Nov 12 10:19:04 2019 +0100
+++ b/src/java.base/share/classes/sun/security/provider/PolicyFile.java Tue Nov 12 01:36:17 2019 -0800
@@ -42,12 +42,14 @@
import java.net.NetPermission;
import java.util.concurrent.ConcurrentHashMap;
import jdk.internal.access.JavaSecurityAccess;
-import static jdk.internal.access.JavaSecurityAccess.ProtectionDomainCache;
import jdk.internal.access.SharedSecrets;
import jdk.internal.util.StaticProperty;
import sun.security.util.*;
import sun.net.www.ParseUtil;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.internal.access.JavaSecurityAccess.ProtectionDomainCache;
+
/**
* This class represents a default Policy implementation for the
* "JavaPolicy" type.
@@ -559,8 +561,7 @@
return false;
}
- private InputStreamReader getInputStreamReader(InputStream is)
- throws IOException {
+ private InputStreamReader getInputStreamReader(InputStream is) {
/*
* Read in policy using UTF-8 by default.
*
@@ -569,7 +570,7 @@
*/
return (notUtf8)
? new InputStreamReader(is)
- : new InputStreamReader(is, "UTF-8");
+ : new InputStreamReader(is, UTF_8);
}
private void initStaticPolicy(final PolicyInfo newInfo) {