From cb4f8529eca5af84365187efdf1051914183e580 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 12:26:49 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    93581:
 Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)       93484: Merged
 V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)          93197: Merged DEV to
 V4.2-BUG-FIX (4.2.5)             92217: MNT-12957 : Paging doesn't work on
 discussions                - Remove limit for count topics.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94968 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../discussion/DiscussionServiceImpl.java     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/source/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java b/source/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
index 3de78a8d14..d579bc29f8 100644
--- a/source/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
+++ b/source/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
@@ -743,11 +743,6 @@ public class DiscussionServiceImpl implements DiscussionService
       sp.setLanguage(SearchService.LANGUAGE_LUCENE);
       sp.setQuery(luceneQuery.toString());
       sp.addSort(sortOn, sortAscending);
-      if (paging.getMaxItems() > 0)
-      {
-          sp.setLimit(paging.getMaxItems());
-          sp.setLimitBy(LimitBy.FINAL_SIZE);
-      }
       if (paging.getSkipCount() > 0)
       {
           sp.setSkipCount(paging.getSkipCount());
@@ -761,7 +756,7 @@ public class DiscussionServiceImpl implements DiscussionService
       try 
       {
          results = searchService.query(sp);
-         pagedResults = wrap(results, nodeRef);
+         pagedResults = wrap(results, nodeRef, paging);
       }
       finally
       {
@@ -938,14 +933,20 @@ public class DiscussionServiceImpl implements DiscussionService
    /**
     * Our class to wrap up search results as {@link TopicInfo} instances
     */
-   private PagingResults<TopicInfo> wrap(final ResultSet finalLuceneResults, final NodeRef container)
+   private PagingResults<TopicInfo> wrap(final ResultSet finalLuceneResults, final NodeRef container, final PagingRequest paging)
    {
       final List<TopicInfo> topics = new ArrayList<TopicInfo>();
+      int cnt = 1;
       for (ResultSetRow row : finalLuceneResults)
       {
          TopicInfo topic = buildTopic(
                row.getNodeRef(), container, row.getQName().getLocalName());
          topics.add(topic);
+         cnt++;
+         if (paging.getMaxItems()>0 && cnt>paging.getMaxItems())
+         {
+             break;
+         }
       }
       
       // Wrap
@@ -974,7 +975,9 @@ public class DiscussionServiceImpl implements DiscussionService
             {
                skipCount = finalLuceneResults.getStart();
             }
-            catch(UnsupportedOperationException e) {}
+            catch(UnsupportedOperationException e) {
+               skipCount = paging.getSkipCount();
+            }
             try
             {
                itemsRemainingAfterThisPage = finalLuceneResults.length();