ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly 2021-10-11 21:06:30 +08:00
parent f218eeee7e
commit fddb24dc9b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -3,11 +3,13 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.7.15 (2021-10-10) # 5.7.15 (2021-10-11)
### 🐣新特性 ### 🐣新特性
* 【db 】 Db.quietSetAutoCommit增加判空（issue#I4D75B@Gitee） * 【db 】 Db.quietSetAutoCommit增加判空（issue#I4D75B@Gitee）
*
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 修复CollUtil.isEqualList两个null返回错误问题（issue#1885@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

3
hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
View File

@ -2948,6 +2948,9 @@ public class CollUtil {
* @since 5.6.0 * @since 5.6.0
*/ */
public static boolean isEqualList(final Collection<?> list1, final Collection<?> list2) { public static boolean isEqualList(final Collection<?> list1, final Collection<?> list2) {
if (list1 == list2){
return true;
}
if (list1 == null || list2 == null || list1.size() != list2.size()) { if (list1 == null || list2 == null || list1.size() != list2.size()) {
return false; return false;
} }

6
hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java
View File

@ -819,7 +819,7 @@ public class IterUtil {
* @return Iterable对象的元素数量 * @return Iterable对象的元素数量
* @since 5.5.0 * @since 5.5.0
*/ */
public static int size(final Iterable<?> iterable) { public static int size(Iterable<?> iterable) {
if (null == iterable) { if (null == iterable) {
return 0; return 0;
} }
@ -838,7 +838,7 @@ public class IterUtil {
* @return Iterator对象的元素数量 * @return Iterator对象的元素数量
* @since 5.5.0 * @since 5.5.0
*/ */
public static int size(final Iterator<?> iterator) { public static int size(Iterator<?> iterator) {
int size = 0; int size = 0;
if (iterator != null) { if (iterator != null) {
while (iterator.hasNext()) { while (iterator.hasNext()) {
@ -862,7 +862,7 @@ public class IterUtil {
* @return 是否相同 * @return 是否相同
* @since 5.6.0 * @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) { if (list1 == list2) {
return true; return true;
} }