From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 13 Jul 2012 16:48:49 +0000 (-0700)
Subject: CSPACE-5397: Requests for refObjs that specify a page number beyond the list end... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=178f2d9b3a5ecf5b03882c59402fa58840a0ff1e;p=tmp%2Fjakarta-migration.git

CSPACE-5397: Requests for refObjs that specify a page number beyond the list end now return an empty list.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index 93f36a29b..2d4db981e 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@ -292,9 +292,12 @@ public class RefNameServiceUtils {
             // in the list results.
             //
             // FIXME: There may well be a pattern-based way to do this
-            // in our framework.
+            // in our framework, and if we can eliminate much of the
+            // non-DRY code below, that would be desirable.
+            
             int startIndex = 0;
             int endIndex = 0;
+            
             // Return all results if pageSize is 0.
             if (pageSize == 0) {
                 startIndex = 0;
@@ -303,25 +306,27 @@ public class RefNameServiceUtils {
                startIndex = pageNum * pageSize;
             }
             
-            // Return an empty list if the start of the requested page is
+            // Return an empty list when the start of the requested page is
             // beyond the last item in the list.
             if (startIndex > list.size()) {
-                wrapperList = null;
+                wrapperList.getAuthorityRefDocItem().clear();
+                commonList.setItemsInPage(wrapperList.getAuthorityRefDocItem().size());
                 return wrapperList;
             }
 
             // Otherwise, return a list of items from the start of the specified
-            // page through the last item on that page, or otherwise through the last
-            // item in the entire list, if it occurs prior to the end of that page.
+            // page through the last item on that page, or otherwise through the
+            // last item in the entire list, if that occurs earlier than the end
+            // of the specified page.
             if (endIndex == 0) {
                 int pageEndIndex = ((startIndex + pageSize));
                 endIndex = (pageEndIndex > list.size()) ? list.size() : pageEndIndex;
             }
             
-            // Slice the list to return only the specified page.
-            // Note: the second argument to List.subList() is exclusive of the
-            // item at its index position, reflecting the zero-index nature of
-            // the list.
+            // Slice the list to return only the specified page of results.
+            // Note: the second argument to List.subList(), endIndex, is
+            // exclusive of the item at its index position, reflecting the
+            // zero-index nature of the list.
             List<AuthorityRefDocList.AuthorityRefDocItem> currentPageList =
                     new ArrayList<AuthorityRefDocList.AuthorityRefDocItem>(list.subList(startIndex, endIndex));
             wrapperList.getAuthorityRefDocItem().clear();