--- a/jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java Thu Apr 21 14:56:40 2016 +0800
+++ b/jdk/src/java.base/share/classes/java/util/PropertyResourceBundle.java Thu Apr 21 13:39:53 2016 +0200
@@ -43,7 +43,6 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.IOException;
-import java.nio.charset.Charset;
import java.nio.charset.MalformedInputException;
import java.nio.charset.StandardCharsets;
import java.nio.charset.UnmappableCharacterException;
@@ -142,8 +141,8 @@
// Check whether the strict encoding is specified.
// The possible encoding is either "ISO-8859-1" or "UTF-8".
private static final String encoding =
- AccessController.doPrivileged(
- new GetPropertyAction("java.util.PropertyResourceBundle.encoding", ""))
+ GetPropertyAction
+ .getProperty("java.util.PropertyResourceBundle.encoding", "")
.toUpperCase(Locale.ROOT);
/**