Skip to content

Commit fbf3ede

Browse files
authored
Don't use Stream.findFirst() to avoid NullPointerException (#695)
1 parent d0e26e3 commit fbf3ede

File tree

1 file changed

+7
-1
lines changed
  • doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement

1 file changed

+7
-1
lines changed

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Listable.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.seasar.doma.jdbc.criteria.statement;
22

3+
import java.util.Iterator;
34
import java.util.List;
45
import java.util.Optional;
56
import java.util.function.Consumer;
@@ -37,7 +38,12 @@ default Stream<ELEMENT> stream() {
3738
* @return the first element of data
3839
*/
3940
default Optional<ELEMENT> fetchOptional() {
40-
return stream().findFirst();
41+
Iterator<ELEMENT> iterator = stream().iterator();
42+
if (iterator.hasNext()) {
43+
return Optional.ofNullable(iterator.next());
44+
} else {
45+
return Optional.empty();
46+
}
4147
}
4248

4349
/**

0 commit comments

Comments
 (0)