Merge pull request #279 from josejulio/bugs/1367505

Bug 1367505 - Trims result to match page controls.
rhq-project · Dec 29, 2016 · 31b1995 · 31b1995
2 parents fef5e1d + d5510f1
commit 31b1995
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...rise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerBean.java b/...rise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerBean.java
@@ -299,6 +299,12 @@ public int compare(Object o1, Object o2) {
             }
         });
 
+        // Trim modifiedResults to match pc.
+        modifiedResults = modifiedResults.subList(
+                Math.min(pc.getStartRow(), modifiedResults.size()),
+                Math.min(pc.getStartRow() + pc.getPageSize(), modifiedResults.size())
+        );
+
         return new PageList<PackageVersionComposite>(modifiedResults, (int) count, pc);
     }
 
@@ -385,6 +391,12 @@ public int compare(Object o1, Object o2) {
             }
         });
 
+        // Trim finalResults to match pc.
+        finalResults = finalResults.subList(
+                Math.min(pc.getStartRow(), finalResults.size()),
+                Math.min(pc.getStartRow() + pc.getPageSize(), finalResults.size())
+        );
+
         return new PageList<PackageVersionComposite>(finalResults, (int) count, pc);
     }