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 (5.2) to 5.2.N (5.2.1)

Browse Source 
126541 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      123404 jkaabimofrad: RA-865: Fixed concurrency issue. (concurrent requests for the same folder path creation can sometimes return "File or folder xyz already exists")


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:04:41 +00:00
parent 728b8739da
commit f294882433
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -128,6 +128,7 @@ import org.alfresco.util.Pair;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.extensions.surf.util.Content;
import org.springframework.extensions.webscripts.servlet.FormData;
import org.springframework.http.InvalidMediaTypeException;
@@ -699,6 +700,11 @@ public class NodesImpl implements Nodes
{
throw new PermissionDeniedException(ade.getMessage());
}
catch (FileExistsException fex)
{
// Assume concurrency failure, so retry
throw new ConcurrencyFailureException(fex.getMessage());
}
}
else if (!isSubClass(nodeRef, ContentModel.TYPE_FOLDER, false))
{