diff --git a/CHANGELOG.md b/CHANGELOG.md index e0ce5faa8..a9cdf81a6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.13.M1 (2023-02-20) +# 5.8.13.M1 (2023-02-21) ### 🐣新特性 ### 🐞Bug修复 @@ -11,6 +11,7 @@ * 【core 】 修复法定年龄计算的BUG(pr#935@Gitee) * 【core 】 修复FileUtil.rename报NoSuchFileException问题(pr#2894@Github) * 【core 】 修复StrUtil.split切分长度为0时的bug(pr#944@Gitee) +* 【core 】 修复ReUtil.delAll方法当 content 仅为空格时的问题(issue#I6GIMT@Gitee) ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java index 11398b7f9..4113b2107 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java @@ -459,7 +459,7 @@ public class ReUtil { * @return 删除后剩余的内容 */ public static String delAll(String regex, CharSequence content) { - if (StrUtil.hasBlank(regex, content)) { + if (StrUtil.hasEmpty(regex, content)) { return StrUtil.str(content); } @@ -475,7 +475,7 @@ public class ReUtil { * @return 删除后剩余的内容 */ public static String delAll(Pattern pattern, CharSequence content) { - if (null == pattern || StrUtil.isBlank(content)) { + if (null == pattern || StrUtil.isEmpty(content)) { return StrUtil.str(content); } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java index f9e4c5efe..18d5ee640 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java @@ -210,4 +210,9 @@ public class ReUtilTest { final String s = ReUtil.replaceAll("1.2.3.4", patternIp, "$1.**.**.$10"); Assert.assertEquals("1.**.**.4", s); } + + @Test + public void issueI6GIMTTest(){ + Assert.assertEquals(StrUtil.EMPTY, ReUtil.delAll("[\\s]*", " ")); + } }