MNT-20822 adding fix for has more

This commit is contained in:
Ross Gale
2020-01-06 16:15:04 +00:00
parent 2dd9015ad8
commit 75bc33640e

View File

@@ -450,11 +450,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
@Override @Override
public boolean hasMore() public boolean hasMore()
{ {
return getNumberFound() >= (returnedObject.getResultSetMetaData() return getUnFilteredResultSet().length() >= getResultSetMetaData()
.getSearchParameters() .getSearchParameters()
.getSkipCount() + returnedObject.getResultSetMetaData() .getMaxItems();
.getSearchParameters()
.getMaxItems());
} }
} }
@@ -495,7 +493,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
returnedObject.getResultSetMetaData().getLimitedBy(), returnedObject.getResultSetMetaData().getLimitedBy(),
PermissionEvaluationMode.EAGER, PermissionEvaluationMode.EAGER,
returnedObject.getResultSetMetaData().getSearchParameters())); returnedObject.getResultSetMetaData().getSearchParameters()));
filteringResultSet.setNumberFound(returnedObject.getNumberFound());
return filteringResultSet; return filteringResultSet;
} }
else else
@@ -509,7 +506,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
returnedObject.getResultSetMetaData().getLimitedBy(), returnedObject.getResultSetMetaData().getLimitedBy(),
PermissionEvaluationMode.EAGER, PermissionEvaluationMode.EAGER,
returnedObject.getResultSetMetaData().getSearchParameters())); returnedObject.getResultSetMetaData().getSearchParameters()));
filteringResultSet.setNumberFound(returnedObject.getNumberFound());
return filteringResultSet; return filteringResultSet;
} }
} }