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

69767: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69723: MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Added code which check status of node (it has private working copy).
      Merged DEV to 4.2-BUG-FIX
      67109 : MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Fixed RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 17:50:11 +00:00
parent f38ddabb2d
commit c5abaaec03
2 changed files with 23 additions and 13 deletions

View File

@@ -178,7 +178,8 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
objecVariant = CMISObjectVariant.CURRENT_VERSION;
objectId = connector.constructObjectId(nodeRef, CMISConnector.UNVERSIONED_VERSION_LABEL);
versionLabel = CMISConnector.UNVERSIONED_VERSION_LABEL;
currentObjectId = objectId;
currentObjectId = objectId;
hasPWC = connector.getCheckOutCheckInService().isCheckedOut(nodeRef);
}
protected void analyseObjectId()