infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-12 03:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

8050968: Extension class loader initialization fails on Win7 x64 zh_TW

Browse Source 
Reviewed-by: alanb, dholmes, sherman
This commit is contained in:
Mandy Chung 2014-07-18 10:40:55 -07:00
parent 1980bab985
commit 1fa3b2ce7f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
View File

@ -1173,8 +1173,7 @@ public class ExtendedCharsets
if (!sun.misc.VM.isBooted())
return;
String map = AccessController.doPrivileged(
(PrivilegedAction<String>) () -> System.getProperty("sun.nio.cs.map"));
String map = getProperty("sun.nio.cs.map");
boolean sjisIsMS932 = false;
boolean iso2022jpIsMS50221 = false;
boolean iso2022jpIsMS50220 = false;
@ -1294,8 +1293,7 @@ public class ExtendedCharsets
}
}
String osName = AccessController.doPrivileged(
(PrivilegedAction<String>) () -> System.getProperty("os.name"));
String osName = getProperty("os.name");
if ("SunOS".equals(osName) || "Linux".equals(osName) || "AIX".equals(osName)
|| osName.contains("OS X")) {
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
@ -1308,6 +1306,18 @@ public class ExtendedCharsets
initialized = true;
}
private static String getProperty(String key) {
// this method may be called during initialization of
// system class loader and thus not using lambda
return AccessController.doPrivileged(
new PrivilegedAction<String>() {
@Override
public String run() {
return System.getProperty(key);
}
});
}
public static String[] aliasesFor(String charsetName) {
if (instance == null)
return null;