Merged 5.2.N (5.2.1) to HEAD (5.2)

129804 amorarasu: REPO-340 / REPO-1136 - V1 REST API: Unlock Node
      - Removed the allowCheckedOut option from the unlock body


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 14:43:45 +00:00
parent d6491804d0
commit caf1c1c8ca
3 changed files with 12 additions and 20 deletions

View File

@@ -2991,12 +2991,7 @@ public class NodesImpl implements Nodes
{
unlockInfo.setIncludeChildren(false);
}
if (unlockInfo.getAllowCheckedOut() == null)
{
unlockInfo.setAllowCheckedOut(false);
}
lockService.unlock(nodeRef, unlockInfo.getIncludeChildren(), unlockInfo.getAllowCheckedOut());
lockService.unlock(nodeRef, unlockInfo.getIncludeChildren());
return getFolderOrDocument(nodeId, parameters);
}