Merge pull request #505 from gavinking/minor-fix

fix to SliceRecord
jakartaee · Feb 29, 2024 · 1dab0ca · 1dab0ca
2 parents 4fc8a93 + b602d28
commit 1dab0ca
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/api/src/main/java/jakarta/data/page/impl/SliceRecord.java b/api/src/main/java/jakarta/data/page/impl/SliceRecord.java
@@ -57,13 +57,13 @@ public <E> PageRequest<E> pageRequest(Class<E> entityClass) {
 
     @Override
     public PageRequest<T> nextPageRequest() {
-        return pageRequest.next();
+        return moreResults ? pageRequest.next() : null;
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <E> PageRequest<E> nextPageRequest(Class<E> entityClass) {
-        return (PageRequest<E>) pageRequest.next();
+        return (PageRequest<E>) nextPageRequest();
     }
 
     @Override