From bd8b00f6233abcdc67e70adb1ae7713110ed11f0 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 21:08:14 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57572: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57536: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1) 57528: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8) 57524: Reverse Merged out of 4.1.7, as it is the cause of MNT-9873 - a new approach is needed (paging or limits on the UI side). Moving both issues to 4.1.N. 56842: Fix for MNT-9595 Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery - tag queries are unlimited git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/search/impl/lucene/LuceneCategoryServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java index 50895dc607..f3fe54d7c4 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java @@ -47,7 +47,6 @@ import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.search.CategoryService; -import org.alfresco.service.cmr.search.LimitBy; import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSetRow; import org.alfresco.service.cmr.search.SearchParameters; @@ -209,9 +208,6 @@ public class LuceneCategoryServiceImpl implements CategoryService searchParameters.addSort("@" + ContentModel.PROP_NAME, true); } searchParameters.addStore(categoryRef.getStoreRef()); - searchParameters.setLimit(-1); - searchParameters.setMaxItems(Integer.MAX_VALUE); - searchParameters.setLimitBy(LimitBy.UNLIMITED); resultSet = searcher.query(searchParameters); // Convert from search results to the required Child Assocs