From e0e96c487f2da1c4254413e31012bae486d4da24 Mon Sep 17 00:00:00 2001 From: taehyun <126179088+KNU-K@users.noreply.github.com> Date: Sun, 17 Nov 2024 18:26:43 +0900 Subject: [PATCH] Simplify implementation of FilteredIterator Closes gh-33902 --- .../java/org/springframework/util/FilteredIterator.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/FilteredIterator.java b/spring-core/src/main/java/org/springframework/util/FilteredIterator.java index dcf48cbcd61..96c9c18ffce 100644 --- a/spring-core/src/main/java/org/springframework/util/FilteredIterator.java +++ b/spring-core/src/main/java/org/springframework/util/FilteredIterator.java @@ -55,17 +55,13 @@ final class FilteredIterator implements Iterator { if (this.nextSet) { return true; } - else { - return setNext(); - } + return setNext(); } @Override public E next() { - if (!this.nextSet) { - if (!setNext()) { + if (!this.nextSet && !setNext()) { throw new NoSuchElementException(); - } } this.nextSet = false; Assert.state(this.next != null, "Next should not be null");