Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

104022: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103942: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103858: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
            103770: Merged V4.1.10 (4.1.10) to V4.1-BUG-FIX (4.1.11)
               103711: Merged DEV to V4.1.10-PATCHES
                  103047: MNT-13839: [CMIS Webservices] "invalidArgument: Version Series does not exist" error appears when creating any content
                   - Use versionSeriesId when objectId is null
                   - Return versionSeries for PWC if objectId is null and provided node has working copy. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-13 16:21:43 +00:00
parent dee9fdcf00
commit 192e5353c0

View File

@@ -2215,6 +2215,18 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
// what kind of object is it?
CMISNodeInfo info = getOrCreateNodeInfo(objectId);
// when webservices binding is used, objectId points to null and versionSeriesId points to original node instead of PWC
// see MNT-13839
if (objectId == null)
{
info = getOrCreateNodeInfo(versionSeriesId);
if (info.hasPWC())
{
NodeRef nodeRef = info.getNodeRef();
info = getOrCreateNodeInfo(connector.getCheckOutCheckInService().getWorkingCopy(nodeRef).toString());
}
}
if (!EnumSet.of(CMISObjectVariant.CURRENT_VERSION, CMISObjectVariant.PWC, CMISObjectVariant.VERSION).contains(info.getObjectVariant()))
{
// the version series id is the id of current version, which is a