zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复SettingLoaderload未抛出异常导致配置文件无法正常遍历的问题（pr#3868@Github）

Browse Source
This commit is contained in:
Looly
2025-02-24 10:24:59 +08:00
parent 4ef8814c14
commit 1c0b6c3da1
9 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
View File

@@ -2,20 +2,13 @@ package cn.hutool.setting;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.resource.NoResourceException;
import cn.hutool.core.io.resource.Resource;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.SystemPropsUtil;
import cn.hutool.core.util.*;
import cn.hutool.log.Log;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.*;
import java.nio.charset.Charset;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -73,19 +66,22 @@ public class SettingLoader {
*
* @param resource 配置文件URL
* @return 加载是否成功
* @throws NoResourceException 如果资源不存在，抛出此异常
*/
public boolean load(Resource resource) {
public boolean load(Resource resource) throws NoResourceException{
if (resource == null) {
throw new NullPointerException("Null setting url define!");
}
log.debug("Load setting file [{}]", resource);
InputStream settingStream = null;
try {
settingStream = resource.getStream();
load(settingStream);
log.debug("Load setting file [{}]", resource);
} catch (Exception e) {
log.error(e, "Load setting error!");
return false;
if(e instanceof NoResourceException){
throw (NoResourceException)e;
}
throw new NoResourceException(e);
} finally {
IoUtil.close(settingStream);
}