ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix charset bug

Browse Source
This commit is contained in:
Looly 2020-02-11 16:46:05 +08:00
parent 9cec19b779
commit 804a15a105
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
### 新特性 ### 新特性
* 【core 】 废弃isMactchRegex，改为isMatchRegex（方法错别字） * 【core 】 废弃isMactchRegex，改为isMatchRegex（方法错别字）
### Bug修复 ### Bug修复
* 【core 】 CharsetUtil在不支持GBK的系统中运行报错问题（issue#731@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

13
hutool-core/src/main/java/cn/hutool/core/util/CharsetUtil.java
View File

@ -26,7 +26,18 @@ public class CharsetUtil {
/** UTF-8 */ /** UTF-8 */
public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8; public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
/** GBK */ /** GBK */
public static final Charset CHARSET_GBK = Charset.forName(GBK); public static final Charset CHARSET_GBK;
static{
//避免不支持GBK的系统中运行报错 issue#731
Charset _CHARSET_GBK = null;
try{
_CHARSET_GBK = Charset.forName(GBK);
} catch (UnsupportedCharsetException e){
//ignore
}
CHARSET_GBK = _CHARSET_GBK;
}
/** /**
* 转换为Charset对象 * 转换为Charset对象