From c5380140422fcdf06a6972bbeadce1b943d933e7 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 29 Aug 2022 10:40:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DFilterIter=E5=BD=93=E5=8F=82?= =?UTF-8?q?=E6=95=B0filter=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- .../src/main/java/cn/hutool/core/collection/FilterIter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ab1d581a..487706127 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.8.6.M1 (2022-08-27) +# 5.8.6.M1 (2022-08-29) ### 🐣新特性 * 【core 】 CollUtil新增addIfAbsent方法（pr#750@Gitee） @@ -26,6 +26,7 @@ * 【core 】 修复CollUtil.lastIndexOf序号错误问题 * 【core 】 修复zip被识别成jar和apk被识别成jar或zip的问题（pr#2548@Github） * 【core 】 修复UrlBuilder.addPath 方法传入非有效路径字符串时，会出现空指针异常的问题（issue#I5O4ML@Gitee） +* 【core 】 修复FilterIter当参数filter为空时存在问题（issue#I5OG7U@Gitee） ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java index 9c5ae2201..f4496eb5d 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/FilterIter.java @@ -84,7 +84,7 @@ public class FilterIter implements Iterator { private boolean setNextObject() { while (iterator.hasNext()) { final E object = iterator.next(); - if (null != filter && filter.accept(object)) { + if (null == filter || filter.accept(object)) { nextObject = object; nextObjectSet = true; return true;