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

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

Browse Source 
57488: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57318: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
         56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
            55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
                - Prevent folders to take part in any kind of shuffle operation.
            56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
               - Unit test that demonstrate issue.
            - Fixed unit test failure that causes prevous merge (r57176) to be reverted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 20:53:09 +00:00
parent eba96fecfa
commit a5295c4fe7
2 changed files with 123 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/webdav/MoveMethod.java
View File

@@ -198,7 +198,7 @@ public class MoveMethod extends HierarchicalMethod
}
// ALF-7079 fix, if destination exists then its content is updated with source content and source is deleted if
// this is a move
if (destFileInfo != null && !sourceParentNodeRef.equals(destParentNodeRef))
if (!sourceFileInfo.isFolder() && destFileInfo != null && !sourceParentNodeRef.equals(destParentNodeRef))
{
copyContentOnly(sourceFileInfo, destFileInfo, fileFolderService);
fileFolderService.setHidden(destFileInfo.getNodeRef(), false);