diff --git a/CHANGELOG.md b/CHANGELOG.md index 9990c45e2..2c0263cdd 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ * 【core 】 修复NumberWordFormatter.format小数问题(issue#3579@Github) * 【db 】 修复JndiDSFactory空指针问题 * 【core 】 修复BiMap.put错误的返回值(pr#1218@Gitee) +* 【core 】 修复BooleanUtil.andOfWrap针对null错误问题(issue#3587@Github) ------------------------------------------------------------------------------------------------------------- # 5.8.27(2024-03-29) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java index 5c3cd1e79..50906efd7 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java @@ -380,7 +380,7 @@ public class BooleanUtil { } for (final Boolean b : array) { - if(isFalse(b)){ + if(!isTrue(b)){ return false; } } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java index e6f409de3..2420cebde 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java @@ -72,4 +72,12 @@ public class BooleanUtilTest { Assert.assertEquals("on", BooleanUtil.toStringOnOff(true)); Assert.assertEquals("off", BooleanUtil.toStringOnOff(false)); } + + @Test + public void issue3587Test() { + Boolean boolean1 = true; + Boolean boolean2 = null; + Boolean result = BooleanUtil.andOfWrap(boolean1, boolean2); + Assert.assertFalse(result); + } } diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java index 90afd7753..0ac930aa5 100644 --- a/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java +++ b/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java @@ -1,6 +1,5 @@ package cn.hutool.json; -import cn.hutool.core.lang.Console; import lombok.Data; import org.junit.Assert; import org.junit.Test;