Merging up from 2.5.4

This commit is contained in:
Ross Gale
2018-06-06 10:06:07 +01:00

View File

@@ -479,6 +479,7 @@ 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
@@ -492,6 +493,7 @@ 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;
} }
} }