diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java index d3e1121bd..7fd6a16a1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java @@ -83,6 +83,11 @@ public class CQuery implements DbReadContext, CancelableQuery { */ private EntityBean currentBean; + /** + * Caches hasNext for consecutive hasNext() calls. + */ + private boolean hasNextCache; + private final BeanPropertyAssocMany lazyLoadManyProperty; private Object lazyLoadParentId; @@ -504,6 +509,7 @@ public class CQuery implements DbReadContext, CancelableQuery { if (auditFindIterate) { auditIterateNextBean(); } + hasNextCache = false; return nextBean; } @@ -513,7 +519,11 @@ public class CQuery implements DbReadContext, CancelableQuery { if (noMoreRows || cancelled || loadedBeanCount >= maxRowsLimit) { return false; } - return readNextBean(); + if (hasNextCache) { + return true; + } + hasNextCache = readNextBean(); + return hasNextCache; } } diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java index 67b6bc466..58b315e4c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java @@ -46,6 +46,40 @@ public class TestQueryFindIterate extends BaseTestCase { assertEquals(2, count.get()); } + @Test + public void test_hasNext_hasNext() { + + ResetBasicData.reset(); + EbeanServer server = Ebean.getServer(null); + + QueryIterator queryIterator = server.find(Customer.class) + .where() + .isNotNull("name") + .setMaxRows(3) + .order().asc("id") + .findIterate(); + + try { + // check that hasNext does not move to the next bean + assertTrue(queryIterator.hasNext()); + assertTrue(queryIterator.hasNext()); + assertTrue(queryIterator.hasNext()); + assertTrue(queryIterator.hasNext()); + assertTrue(queryIterator.hasNext()); + + Customer first = queryIterator.next(); + logger.info("first: {}", queryIterator.next()); + assertEquals(first.getId(), Integer.valueOf(1)); + + while (queryIterator.hasNext()) { + logger.info("next: {}", queryIterator.next()); + } + + } finally { + queryIterator.close(); + } + } + @Test public void findEach() {