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
This commit is contained in:
Dave Ward
2013-03-11 15:00:09 +00:00
parent 01b6ae39b1
commit bf7da274c4

View File

@@ -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
{