Repository: oodt Updated Branches: refs/heads/master 3903325ce -> 6be792102
OODT-889 move list prune Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/6be79210 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/6be79210 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/6be79210 Branch: refs/heads/master Commit: 6be79210207fa5b93bb9417c75b36d3e1577b7e3 Parents: 3903325 Author: Tom Barber <[email protected]> Authored: Tue Oct 13 16:45:28 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Tue Oct 13 16:45:28 2015 +0100 ---------------------------------------------------------------------- .../org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/6be79210/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java index c91060e..574b7e9 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java @@ -728,12 +728,11 @@ public class LuceneCatalog implements Catalog { for (int pageNum = 1; pageNum < numPages + 1; pageNum++) { List<Product> pageProducts = paginateQuery(query, type, pageNum, null); - if(n<=pageProducts.size()) { - products.addAll(pageProducts.subList(0, n)); - } - else{ products.addAll(pageProducts); - } + } + + if(n<=products.size()) { + return products.subList(0, n); } return products;
