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

129764 jvonka: REPO-1144: LockService - add isLocked & isLockedAndReadOnly common helper methods to public API
   - remove duplicated code from various locations to use the new methods
   - add sanity checks to Lock*Test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 14:42:34 +00:00
parent 983ab23eb2
commit c12bf069fa

View File

@@ -427,11 +427,7 @@ public class Node implements Serializable, NamespacePrefixResolverProvider
if (hasAspect(ContentModel.ASPECT_LOCKABLE))
{
LockStatus lockStatus = getServiceRegistry().getLockService().getLockStatus(getNodeRef());
if (lockStatus == LockStatus.LOCKED || lockStatus == LockStatus.LOCK_OWNER)
{
locked = Boolean.TRUE;
}
locked = getServiceRegistry().getLockService().isLocked(getNodeRef());
}
}