From 75bc33640e3339419cfe5a8ad9d0339a74ba1ff7 Mon Sep 17 00:00:00 2001
From: Ross Gale <ross.gale@alfresco.com>
Date: Mon, 6 Jan 2020 16:15:04 +0000
Subject: [PATCH] MNT-20822 adding fix for has more

---
 .../capability/RMAfterInvocationProvider.java             | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
index 086e420e9d..c9736d052d 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
@@ -450,11 +450,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
             @Override
             public boolean hasMore()
             {
-                return getNumberFound() >= (returnedObject.getResultSetMetaData()
+                return getUnFilteredResultSet().length() >= getResultSetMetaData()
                     .getSearchParameters()
-                    .getSkipCount() + returnedObject.getResultSetMetaData()
-                    .getSearchParameters()
-                    .getMaxItems());
+                    .getMaxItems();
             }
         }
 
@@ -495,7 +493,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
-                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
             else
@@ -509,7 +506,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
-                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
         }