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 (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
75759: Reverse Merge HEAD-BUG-FIX (5.0)
      74605 : Reverse Merge HEAD-BUG-FIX (5.0)
         << Caused 1 build error https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD0-384 >>
         74567 : Merged DEV to HEAD-BUG-FIX (5.0)
            69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
               - TYPE_BASE is valid CMIS type
            73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
               - Create association between cmis:document and cmis:item test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 13:49:11 +00:00
parent 915c6a916b
commit ebf8652ebb
4 changed files with 173 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -1305,9 +1305,9 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
String sourceId = connector.getSourceIdProperty(properties);
CMISNodeInfo sourceInfo = getOrCreateNodeInfo(sourceId, "Source");
if (!sourceInfo.isVariant(CMISObjectVariant.CURRENT_VERSION) && !sourceInfo.isVariant(CMISObjectVariant.FOLDER))
if (!sourceInfo.isVariant(CMISObjectVariant.CURRENT_VERSION) && !sourceInfo.isVariant(CMISObjectVariant.FOLDER) && !sourceInfo.isVariant(CMISObjectVariant.ITEM))
{
throw new CmisInvalidArgumentException("Source is not the latest version of a document or a folder object!");
throw new CmisInvalidArgumentException("Source is not the latest version of a document, a folder or an item object!");
}
final NodeRef sourceNodeRef = sourceInfo.getNodeRef();
@@ -1316,10 +1316,10 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
String targetId = connector.getTargetIdProperty(properties);
CMISNodeInfo targetInfo = getOrCreateNodeInfo(targetId, "Target");
if (!targetInfo.isVariant(CMISObjectVariant.CURRENT_VERSION) && !targetInfo.isVariant(CMISObjectVariant.FOLDER))
if (!targetInfo.isVariant(CMISObjectVariant.CURRENT_VERSION) && !targetInfo.isVariant(CMISObjectVariant.FOLDER) && !targetInfo.isVariant(CMISObjectVariant.ITEM))
{
throw new CmisInvalidArgumentException(
"Target is not the latest version of a document or a folder object!!");
"Target is not the latest version of a document, a folder or an item object!!");
}
final NodeRef targetNodeRef = targetInfo.getNodeRef();