Skip to content

Commit 270d373

Browse files
christophstroblmp911de
authored andcommitted
DATAMONGO-1728 - Fix NPE in ExecutableFindOperation.first().
Original pull request: #476.
1 parent 697f5ad commit 270d373

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ static class DelegatingQueryCursorPreparer implements CursorPreparer {
186186
@Override
187187
public FindIterable<Document> prepare(FindIterable<Document> cursor) {
188188

189-
FindIterable<Document> target = delegate.prepare(cursor);
190-
189+
FindIterable<Document> target = delegate != null ? delegate.prepare(cursor) : cursor;
191190
return limit.map(target::limit).orElse(target);
192191
}
193192

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ public void findAllNearByWithCollectionAndProjection() {
213213
assertThat(results.getContent().get(0).getContent().getId()).isEqualTo("alderan");
214214
}
215215

216+
@Test // DATAMONGO-1728
217+
public void firstShouldReturnFirstEntryInCollection() {
218+
assertThat(template.query(Person.class).first()).isNotEmpty();
219+
}
220+
216221
@Data
217222
@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
218223
static class Person {

0 commit comments

Comments
 (0)