Added paging on all find commands.

The find commands in some REST services have been modified to support
paging to be consistent with others. The other find commands have been
cleaned up as well.

1 files changed, 4 insertions, 2 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
index bef0455a9..49cd4515d 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
@@ -88,14 +88,16 @@ public class KeyRequestDAO extends CMSRequestDAO {
 
         CMSRequestInfos cmsInfos = listCMSRequests(filter, start, pageSize, maxResults, maxTime, uriInfo);
 
-        Collection<? extends CMSRequestInfo> cmsList = cmsInfos.getRequests();
+        ret.setTotal(cmsInfos.getTotal());
+
+        Collection<? extends CMSRequestInfo> cmsList = cmsInfos.getEntries();
 
         // We absolutely know 100% that this list is a list
         // of KeyRequestInfo objects. This is because the method
         // createCMSRequestInfo. Is the only one adding to it
 
         List<KeyRequestInfo> list = (List<KeyRequestInfo>) cmsList;
-        ret.setRequests(list);
+        ret.setEntries(list);
 
         ret.setLinks(cmsInfos.getLinks());