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

100846: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100757: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99879: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99811: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99257 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
                  - Return a current node as head version in version series
               99649,99789 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
                  - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-31 23:13:54 +00:00
parent 17e4c1b55e
commit 0fbc74c6fc
2 changed files with 131 additions and 0 deletions

View File

@@ -2262,6 +2262,11 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
for (Version version : versionHistory.getAllVersions())
{
CMISNodeInfo versionInfo = createNodeInfo(version.getFrozenStateNodeRef(), versionHistory);
// MNT-9557 fix. Replace head version with current node info
if (versionHistory.getHeadVersion().equals(version))
{
versionInfo = createNodeInfo(nodeRef);
}
result.add(
connector.createCMISObject(