inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

Browse Source 
62905: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61335: ACE-33 implementation of cmis:items
          add permissions
          create and delete of cmis:items 
          some unit test fixes
          new unit test for items


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:23:58 +00:00
parent 30b1d43c90
commit c38c6fe1d7
6 changed files with 128 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -1262,7 +1262,15 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
*/
public String createObjectId(NodeRef currentVersionNodeRef)
{
if(getFileFolderService().getFileInfo(currentVersionNodeRef).isFolder())
FileInfo fileInfo = getFileFolderService().getFileInfo(currentVersionNodeRef);
if(fileInfo == null)
{
// not a file or a folder
return constructObjectId(currentVersionNodeRef, null);
}
if(fileInfo.isFolder())
{
return constructObjectId(currentVersionNodeRef, null);
}
@@ -1407,7 +1415,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{
return;
}
if (!childTypes.contains(childType))
{
throw new CmisConstraintException("Objects of type '" + childType + "' cannot be added to this folder!");