inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
125470 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125051 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124925 adragoi: Merged DEV to V4.2-BUG-FIX (4.2.7)
            124738 adragoi: MNT-14882 : NFS Client: Issuing 'list' command on a mounted directory with over 1000 entries does not return
               - save resumeId state on ContentSearchContext


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 12:14:53 +00:00
parent e574e67bac
commit 3d05032155
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/filesys/repo/ContentSearchContext.java
View File

@@ -486,21 +486,22 @@ public class ContentSearchContext extends SearchContext
* @param resumeId Resume point id. * @param resumeId Resume point id.
* @return true if the search can be restarted, else false. * @return true if the search can be restarted, else false.
*/ */
public boolean restartAt(int resumeId) public boolean restartAt(int resumeIdParameter)
{ {
// Resume ids are one based as zero has special meaning for some protocols, adjust the resume id // Resume ids are one based as zero has special meaning for some protocols, adjust the resume id
resumeId--; resumeIdParameter--;
// Check if the resume point is in the pseudo file list // Check if the resume point is in the pseudo file list
if (pseudoList != null) if (pseudoList != null)
{ {
if ( resumeId < pseudoList.numberOfFiles()) if ( resumeIdParameter < pseudoList.numberOfFiles())
{ {
// Resume at a pseudo file // Resume at a pseudo file
index = resumeId; index = resumeIdParameter;
resumeId = resumeIdParameter + 1;
donePseudoFiles = false; donePseudoFiles = false;
return true; return true;
@@ -509,15 +510,16 @@ public class ContentSearchContext extends SearchContext
{ {
// Adjust the resume id so that it is an index into the main file list // Adjust the resume id so that it is an index into the main file list
resumeId -= pseudoList.numberOfFiles(); resumeIdParameter -= pseudoList.numberOfFiles();
} }
} }
// Check if the resume point is valid // Check if the resume point is valid
if ( results != null && resumeId < results.size()) if ( results != null && resumeIdParameter < results.size())
{ {
index = resumeId; index = resumeIdParameter;
resumeId = resumeIdParameter + 1;
donePseudoFiles = true; donePseudoFiles = true;
return true; return true;