From bf7da274c42584d28a9215c06d5d05f315e55237 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 11 Mar 2013 15:00:09 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 47870: ALF-13949: Copying folder which contains working copy doesn't work properly - Avoid interfering with current behaviour on a move in order to fix broken CIFS unit test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/model/filefolder/FileFolderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java index beef653df3..075cc59a13 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java +++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java @@ -1142,7 +1142,7 @@ public class FileFolderServiceImpl implements FileFolderService // ALF-13949: WorkingCopyAspect intentionally generates new names for all copies of working copies (which no // longer have the working copy aspect) so leave these alone after copy - if (!currentName.equals(newName) && !nodeService.hasAspect(sourceNodeRef, ContentModel.ASPECT_WORKING_COPY)) + if (!currentName.equals(newName) && (move || !nodeService.hasAspect(sourceNodeRef, ContentModel.ASPECT_WORKING_COPY))) { try {