Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-07-24 17:32:48 +00:00 · 2006-09-02 18:19:00 +00:00
parent db3c29b45e
commit 820da6ecab
147 changed files with 9873 additions and 1289 deletions
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -586,13 +586,20 @@ public class FileFolderServiceImpl implements FileFolderService
        }
        else
        {
-            // copy the node
-            targetNodeRef = copyService.copy(
-                    sourceNodeRef,
-                    targetParentRef,
-                    assocRef.getTypeQName(),
-                    qname,
-                    true);
+            try
+            {
+                // copy the node
+                targetNodeRef = copyService.copy(
+                        sourceNodeRef,
+                        targetParentRef,
+                        assocRef.getTypeQName(),
+                        qname,
+                        true);
+            }
+            catch (DuplicateChildNodeNameException e)
+            {
+                throw new FileExistsException(targetParentRef, newName);
+            }
        }
       
        // Only update the name if it has changed