inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
71614: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71278: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70686: Merged DEV to V4.1-BUG-FIX (4.1.9)
            70361: MNT-11120: FileFolderService.list does not order properly
             - Check next sort properties if current are null for both nodes.
             - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:32:15 +00:00
parent 748acbfa8e
commit 6901888160
2 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java
View File

@@ -405,7 +405,14 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
if (pv1 == null)
{
return (pv2 == null ? 0 : -1);
if(pv2 == null && sortProps.size() > 1)
{
return compareImpl(node1In, node2In, sortProps.subList(1, sortProps.size()));
}
else
{
return (pv2 == null ? 0 : -1);
}
}
else if (pv2 == null)
{