stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8132459: ExceptionInInitializerError from 'java -version' on Linux under zh_CN.GB18030 locale

Browse Source 
To add more charsets into base module for linux and solaris

Reviewed-by: alanb, simonis
This commit is contained in:
Xueming Shen 2015-07-30 08:46:21 -07:00
parent 81705a9e0c
commit 46d78c85b4
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/data/charsetmapping/charsets
View File

@ -547,7 +547,7 @@ charset GBK GBK # Simplified Chinese
charset GB18030 GB18030 charset GB18030 GB18030
package sun.nio.cs.ext package sun.nio.cs.ext
type source type template
alias gb18030-2000 alias gb18030-2000
charset GB2312 EUC_CN charset GB2312 EUC_CN

7
jdk/make/data/charsetmapping/stdcs-linux
View File

@ -9,9 +9,16 @@ EUC_KR
EUC_JP EUC_JP
EUC_JP_LINUX EUC_JP_LINUX
EUC_JP_Open EUC_JP_Open
EUC_TW
GBK GBK
GB18030
ISO_8859_11
ISO_8859_3
ISO_8859_6
ISO_8859_8
Johab Johab
PCK PCK
TIS_620
JIS_X_0201 JIS_X_0201
JIS_X_0208 JIS_X_0208
JIS_X_0212 JIS_X_0212

2
jdk/make/data/charsetmapping/stdcs-solaris
View File

@ -11,12 +11,14 @@ EUC_JP_LINUX
EUC_JP_Open EUC_JP_Open
EUC_TW EUC_TW
GBK GBK
GB18030
ISO_8859_11 ISO_8859_11
ISO_8859_3 ISO_8859_3
ISO_8859_6 ISO_8859_6
ISO_8859_8 ISO_8859_8
Johab Johab
PCK PCK
TIS_620
JIS_X_0201 JIS_X_0201
JIS_X_0208 JIS_X_0208
JIS_X_0212 JIS_X_0212

6
jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java → jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,7 @@
/* /*
*/ */
package sun.nio.cs.ext; package $PACKAGE$;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.CharBuffer; import java.nio.CharBuffer;
@ -44,7 +44,7 @@ public class GB18030
private static final int GB18030_FOUR_BYTE = 3; private static final int GB18030_FOUR_BYTE = 3;
public GB18030() { public GB18030() {
super("GB18030", ExtendedCharsets.aliasesFor("GB18030")); super("GB18030", $ALIASES$);
} }
public boolean contains(Charset cs) { public boolean contains(Charset cs) {