diff --git a/CHANGELOG.md b/CHANGELOG.md index 71037d9516..82d371eef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### 新特性 * 【crypto】 提供HmacSM3支持(issue#396@Github) +* 【setting】 SettingLoader添加同步锁(issue#396@Github) ### Bug修复 * 【log】 修复log模块模板拼接时没有判断等级关闭与否的问题 diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 8d9555bb69..1c30594561 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index e6edd68ec8..b2cc987386 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 36de126d82..ccdda6e670 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-bloomFilter diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 07253b6bbf..605df1d490 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index ca64c60a91..0bcf83df4e 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index 564d2e1952..16b8701cd5 100644 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 2d95453bcd..5e9f675af7 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 2a66487dd3..25ea342a38 100644 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index d77bcd3c3a..4ddb333eb7 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index 2c8fc61f81..145546d1d0 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index a5b5c1adca..cc7d80c7e5 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 2c746260d1..a8f9da9170 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 2d422ace79..5c3bfd9352 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-json diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index 8ea74890cb..7c198e7e00 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index 863a5f8c9c..172ba5998a 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index e27eb23676..7d1b15968e 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index db98ed0613..b1abcc1f17 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-setting diff --git a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java index 362d75713b..c416836a6e 100644 --- a/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java +++ b/hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java @@ -98,7 +98,7 @@ public boolean load(UrlResource urlResource) { * @return 加载成功与否 * @throws IOException IO异常 */ - public boolean load(InputStream settingStream) throws IOException { + synchronized public boolean load(InputStream settingStream) throws IOException { this.groupedMap.clear(); BufferedReader reader = null; try { @@ -177,7 +177,7 @@ public void store(String absolutePath) { * @param writer Writer * @throws IOException IO异常 */ - private void store(PrintWriter writer) throws IOException { + synchronized private void store(PrintWriter writer) throws IOException { for (Entry> groupEntry : this.groupedMap.entrySet()) { writer.println(StrUtil.format("{}{}{}", CharUtil.BRACKET_START, groupEntry.getKey(), CharUtil.BRACKET_END)); for (Entry entry : groupEntry.getValue().entrySet()) { diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index f7524348f6..94ac55d1f5 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index f6000883d5..5b11db20ed 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool-system diff --git a/pom.xml b/pom.xml index 316de02cdf..dc7147435c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 4.5.13-SNAPSHOT + 4.5.13 hutool 提供丰富的Java工具方法 https://github.com/looly/hutool