diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c45814e5..1d752a394 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,13 @@ ------------------------------------------------------------------------------------------------------------- -# 5.7.15 (2021-10-10) +# 5.7.15 (2021-10-11) ### 🐣新特性 * 【db 】 Db.quietSetAutoCommit增加判空(issue#I4D75B@Gitee) +* ### 🐞Bug修复 +* 【core 】 修复CollUtil.isEqualList两个null返回错误问题(issue#1885@Github) ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java index 2083ced3d..7ab4a9c23 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -2948,6 +2948,9 @@ public class CollUtil { * @since 5.6.0 */ public static boolean isEqualList(final Collection list1, final Collection list2) { + if (list1 == list2){ + return true; + } if (list1 == null || list2 == null || list1.size() != list2.size()) { return false; } diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java index ef0991fc8..c538e317c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java @@ -819,7 +819,7 @@ public class IterUtil { * @return Iterable对象的元素数量 * @since 5.5.0 */ - public static int size(final Iterable iterable) { + public static int size(Iterable iterable) { if (null == iterable) { return 0; } @@ -838,7 +838,7 @@ public class IterUtil { * @return Iterator对象的元素数量 * @since 5.5.0 */ - public static int size(final Iterator iterator) { + public static int size(Iterator iterator) { int size = 0; if (iterator != null) { while (iterator.hasNext()) { @@ -862,7 +862,7 @@ public class IterUtil { * @return 是否相同 * @since 5.6.0 */ - public static boolean isEqualList(final Iterable list1, final Iterable list2) { + public static boolean isEqualList(Iterable list1, Iterable list2) { if (list1 == list2) { return true; }