2 files changed, 17 insertions, 17 deletions

diff --git a/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
index f7c9f7aae..e54f8a4c6 100644
--- a/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
+++ b/base/common/src/com/netscape/cms/servlet/request/CMSRequestDAO.java
@@ -18,8 +18,6 @@
 package com.netscape.cms.servlet.request;
 
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriBuilder;
@@ -84,8 +82,8 @@ public abstract class CMSRequestDAO {
      */
     public CMSRequestInfos listCMSRequests(String filter, RequestId start, int pageSize, int maxResults, int maxTime,
             UriInfo uriInfo) throws EBaseException {
-        List<CMSRequestInfo> list = new ArrayList<CMSRequestInfo>();
-        List<Link> links = new ArrayList<Link>();
+
+        CMSRequestInfos ret = new CMSRequestInfos();
         int totalSize = 0;
         int current = 0;
 
@@ -100,7 +98,7 @@ public abstract class CMSRequestDAO {
 
             for (int i = 0; i < numRecords; i++) {
                 IRequest request = vlvlist.getElementAt(i);
-                list.add(createCMSRequestInfo(request, uriInfo));
+                ret.addRequest(createCMSRequestInfo(request, uriInfo));
             }
         } else {
             // The non-vlv requests are indexed, but are not paginated.
@@ -109,13 +107,13 @@ public abstract class CMSRequestDAO {
             IRequestList requests = queue.listRequestsByFilter(filter, maxResults, maxTime);
 
             if (requests == null) {
-                return null;
+                return ret;
             }
             while (requests.hasMoreElements()) {
                 RequestId rid = requests.nextElement();
                 IRequest request = queue.findRequest(rid);
                 if (request != null) {
-                    list.add(createCMSRequestInfo(request, uriInfo));
+                    ret.addRequest(createCMSRequestInfo(request, uriInfo));
                 }
             }
         }
@@ -137,7 +135,7 @@ public abstract class CMSRequestDAO {
             int next = current + pageSize + 1;
             URI nextUri = builder.clone().build(next, pageSize);
             Link nextLink = new Link("next", nextUri.toString(), "application/xml");
-            links.add(nextLink);
+            ret.addLink(nextLink);
         }
 
         // previous link
@@ -145,12 +143,9 @@ public abstract class CMSRequestDAO {
             int previous = current - pageSize;
             URI previousUri = builder.clone().build(previous, pageSize);
             Link previousLink = new Link("previous", previousUri.toString(), "application/xml");
-            links.add(previousLink);
+            ret.addLink(previousLink);
         }
 
-        CMSRequestInfos ret = new CMSRequestInfos();
-        ret.setRequests(list);
-        ret.setLinks(links);
         return ret;
     }
 
diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java
index 775c0ed28..12f3bb7ee 100644
--- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java
+++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestService.java
@@ -42,6 +42,11 @@ import com.netscape.cmsutil.ldap.LDAPUtil;
  */
 public class KeyRequestService extends PKIService implements KeyRequestResource {
 
+    public static final int DEFAULT_START = 0;
+    public static final int DEFAULT_PAGESIZE = 20;
+    public static final int DEFAULT_MAXRESULTS = 100;
+    public static final int DEFAULT_MAXTIME = 10;
+
     /**
      * Used to retrieve key request info for a specific request
      */
@@ -169,17 +174,17 @@ public class KeyRequestService extends PKIService implements KeyRequestResource
      * Used to generate list of key requests based on the search parameters
      */
     public KeyRequestInfos listRequests(String requestState, String requestType, String clientID,
-            RequestId start, int pageSize, int maxResults, int maxTime) {
+            RequestId start, Integer pageSize, Integer maxResults, Integer maxTime) {
         // auth and authz
 
         // get ldap filter
         String filter = createSearchFilter(requestState, requestType, clientID);
         CMS.debug("listRequests: filter is " + filter);
 
-        // get start marker
-        if (start == null) {
-            start = new RequestId(KeyRequestResource.DEFAULT_START);
-        }
+        start = start == null ? new RequestId(KeyRequestService.DEFAULT_START) : start;
+        pageSize = pageSize == null ? DEFAULT_PAGESIZE : pageSize;
+        maxResults = maxResults == null ? DEFAULT_MAXRESULTS : maxResults;
+        maxTime = maxTime == null ? DEFAULT_MAXTIME : maxTime;
 
         KeyRequestDAO reqDAO = new KeyRequestDAO();
         KeyRequestInfos requests;