From d891c2d4365d312fb3395180b4857417c732a11f Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:34:55 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 71774: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 71679: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3) 71479: MNT-11493: Merged DEV to V4.1-BUG-FIX (4.1.9) 71411: MNT-11493 Pagination controls for second page of tagged links are incorrect git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/links/LinksServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/links/LinksServiceImpl.java b/source/java/org/alfresco/repo/links/LinksServiceImpl.java index d6b6a7cc2d..fbdd1f8be0 100644 --- a/source/java/org/alfresco/repo/links/LinksServiceImpl.java +++ b/source/java/org/alfresco/repo/links/LinksServiceImpl.java @@ -456,7 +456,10 @@ public class LinksServiceImpl implements LinksService { skipCount = finalLuceneResults.getStart(); } - catch(UnsupportedOperationException e) {} + catch(UnsupportedOperationException e) + { + skipCount = paging.getSkipCount(); + } try { itemsRemainingAfterThisPage = finalLuceneResults.length();