ACE-5040: Merged 5.1.N (5.1.1) to HEAD (5.1)

120106 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
         119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
            119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
               - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
               100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix for tests failures
               100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
               100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
                  Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                     100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                        100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                           99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Don't include PWC in a version series
                           99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Return PWC as a part of version series. Fixes to pass TCK
               101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                     100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                        - Added init-method for CMISConnector. Test is added
               101597 : Merged DEV to 5.0.N (5.0.2)
                  101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2016-01-25 12:16:13 +00:00
parent c1b1962a39
commit 863f91e15c
4 changed files with 23 additions and 90 deletions

View File

@@ -640,7 +640,7 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
public boolean isLatestVersion()
{
return (isCurrentVersion() && !hasPWC()) || isPWC();
return isCurrentVersion();
}
public boolean isLatestMajorVersion()
@@ -941,18 +941,16 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
private NodeRef getLatestNonMajorVersionNodeRef()
{
if (isPWC())
{
return nodeRef;
}
else if (hasPWC())
{
return connector.getCheckOutCheckInService().getWorkingCopy(getCurrentNodeNodeRef());
}
else
{
// if (isPWC())
// {
// return nodeRef;
// } else if (hasPWC())
// {
// return connector.getCheckOutCheckInService().getWorkingCopy(getCurrentNodeNodeRef());
// } else
// {
return getCurrentNodeNodeRef();
}
// }
}
// TODO lock here??