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 
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
This commit is contained in:
Will Abson
2014-06-25 15:36:00 +00:00
parent 0ff7a903f8
commit c624f32acf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/filesys/repo/CifsHelper.java
View File

@@ -879,8 +879,8 @@ public class CifsHelper
// Check if the node has any child files/folders
List<FileInfo> files = fileFolderService.listFiles( folderNode);
if ( files == null || files.size() == 0)
List<FileInfo> filesAndFolders = fileFolderService.list(folderNode);
if ( filesAndFolders == null || filesAndFolders.size() == 0)
{
return true;
}