From 486758b0e3ec475fd562b75c81aedb21c104543c Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 8 Jun 2022 15:59:51 +0800 Subject: [PATCH] fix --- .../java/cn/hutool/core/collection/CollUtil.java | 13 ------------- .../cn/hutool/core/collection/iter/IterUtil.java | 3 +++ 2 files changed, 3 insertions(+), 13 deletions(-) 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 aafcdcd63..182e03ebb 100755 --- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java @@ -1964,19 +1964,6 @@ public class CollUtil { return IterUtil.getFirst(iterable); } - /** - * 获取集合的第一个元素 - * - * @param 集合元素类型 - * @param iterator {@link Iterator} - * @return 第一个元素 - * @see IterUtil#getFirst(Iterator) - * @since 3.0.1 - */ - public static T getFirst(final Iterator iterator) { - return IterUtil.getFirst(iterator); - } - /** * 获取集合的最后一个元素 * diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java index ec3c0d9fa..e4dec822d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/collection/iter/IterUtil.java @@ -556,6 +556,9 @@ public class IterUtil { * @since 5.8.0 */ public static E get(final Iterator iterator, int index) throws IndexOutOfBoundsException { + if(null == iterator){ + return null; + } Assert.isTrue(index >= 0, "[index] must be >= 0"); while (iterator.hasNext()) { index--;