Skip to content

Commit a05c3f8

Browse files
authored
Merge pull request scala/scala#7219 from tIGO/scala-11153
[scala/scala#11153] add null-check in ConcatIterator.advance
2 parents 5a63ecb + 275f09d commit a05c3f8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

library/src/scala/collection/Iterator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ object Iterator extends IterableFactory[Iterator] {
10501050
tail = tail.tail
10511051
merge()
10521052
if (currentHasNextChecked) true
1053-
else if (current.hasNext) {
1053+
else if ((current ne null) && current.hasNext) {
10541054
currentHasNextChecked = true
10551055
true
10561056
} else advance()

0 commit comments

Comments
 (0)