From c624f32acf4084e8f29061703d595d21ccc80ba0 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:36:00 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 72011: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 71988: Merged DEV to V4.2-BUG-FIX (4.2.3) 71877 : MNT-11380 : Content of folder gets lost, if moving it via CIFS from source to target, where a folder of the same name already exists - Folder is not empty if it contains filders or files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/filesys/repo/CifsHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/filesys/repo/CifsHelper.java b/source/java/org/alfresco/filesys/repo/CifsHelper.java index 323c00dc0e..f197a60a31 100644 --- a/source/java/org/alfresco/filesys/repo/CifsHelper.java +++ b/source/java/org/alfresco/filesys/repo/CifsHelper.java @@ -879,8 +879,8 @@ public class CifsHelper // Check if the node has any child files/folders - List files = fileFolderService.listFiles( folderNode); - if ( files == null || files.size() == 0) + List filesAndFolders = fileFolderService.list(folderNode); + if ( filesAndFolders == null || filesAndFolders.size() == 0) { return true; }