Merged CMIS063 to HEAD

16809: CMIS 0.7 upgrade - checkpoint.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-10-29 18:00:30 +00:00
parent d4b2de0ee2
commit ec7bb80cf3
9 changed files with 22 additions and 3 deletions

View File

@@ -168,7 +168,8 @@ public class ContentSet extends AbstractWebScript
ContentReader reader = contentService.getReader(nodeRef, propertyQName);
if (reader != null)
{
throw new WebScriptException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Content already exists.");
// error code as per CMIS specification
throw new WebScriptException(HttpServletResponse.SC_CONFLICT, "Content already exists.");
}
}