Merged /BRANCHES/DEV/BELARUS/V4.2-BUG-FIX-2013_12_09 to HEAD (4.3/Cloud)

58842 : CLOUD-2204 : Cloud2. Litmus tests. Some regression failures 
      - GetLockState including tenant
   58806 : CLOUD-2204 : Cloud2. Litmus tests. Some regression failures 
      - WebDAV-lock behavior test added for multy-tenancy 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2013-12-11 15:04:25 +00:00
parent 31c1eb38f8
commit 52065eb032

View File

@@ -821,6 +821,7 @@ public class LockServiceImpl implements LockService,
public LockState getLockState(NodeRef nodeRef)
{
// Check in-memory for ephemeral locks first.
nodeRef = tenantService.getName(nodeRef);
LockState lockState = lockStore.get(nodeRef);
//ALF-20361: It is possible that a rollback has resulted in a "non-lock" lock state being added to