Index: src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java =================================================================== --- src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java (Revision 1886857) +++ src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java (Arbeitskopie) @@ -70,7 +70,7 @@ prefetchIterator = null; } boolean result = it.hasNext(); - if (!result) { + if (!result && size == -1) { size = position; } return result;