From f7744f165221561022dc6da548cf46df8f4a2028 Mon Sep 17 00:00:00 2001
From: Jamal Kaabi-Mofrad <Jamal.kaabimofrad@alfresco.com>
Date: Tue, 10 May 2016 11:44:08 +0000
Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)    124828
 jvonka: RA-896 - List Node Children filtering - fix build/test fallout

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/rest/api/impl/NodesImpl.java | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/impl/NodesImpl.java b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
index f2ddc6270c..a974da8543 100644
--- a/source/java/org/alfresco/rest/api/impl/NodesImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/NodesImpl.java
@@ -1165,38 +1165,37 @@ public class NodesImpl implements Nodes
         final PagingResults<FileInfo> pagingResults;
 
         // notes (see also earlier validation checks):
+        // - no filtering means any types/sub-types (well, apart from hidden &/or default ignored types - eg. systemfolder, fm types)
         // - node type filtering is mutually exclusive from isFile/isFolder, can optionally also include sub-types
         // - isFile & isFolder cannot both be true
         // - (isFile=false) means any other types/sub-types (other than files)
         // - (isFolder=false) means any other types/sub-types (other than folders)
-        // - (isFile=false and isFolder=false) means any types/sub-types (other than files or folders)
+        // - (isFile=false and isFolder=false) means any other types/sub-types (other than files or folders)
 
         if (filterNodeTypeQName == null)
         {
-            if (Boolean.FALSE.equals(includeFiles) && Boolean.FALSE.equals(includeFolders))
+            if ((includeFiles == null) && (includeFolders == null))
             {
-                includeFiles = false;
-                includeFolders = false;
-
+                // no additional filtering
                 filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
             }
-
-            if (includeFiles != null)
+            else if ((includeFiles != null) && (includeFolders != null))
             {
-                if ((! includeFiles) && (includeFolders == null))
+                if ((! includeFiles) && (! includeFolders))
                 {
-                    // isFile=false
+                    // no files or folders
                     filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
                 }
             }
-
-            if (includeFolders != null)
+            else if ((includeFiles != null) && (! includeFiles))
             {
-                if ((! includeFolders) && (includeFiles == null))
-                {
-                    // isFolder=false
-                    filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
-                }
+                // no files
+                filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
+            }
+            else if ((includeFolders != null) && (! includeFolders))
+            {
+                // no folders
+                filterNodeTypeQName = ContentModel.TYPE_CMOBJECT;
             }
         }