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/HEAD/root@126541 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 11:24:21 +00:00
parent d139aad885
commit 1c187217b3

View File

@@ -121,6 +121,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;
@@ -692,6 +693,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))
{