inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-8583 - Lock Service always returns LOCK_OWNER for Owner.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-07-06 12:20:50 +00:00
parent 9f0ab3d127
commit ddeccadc52
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/lock/LockServiceImpl.java
View File

@@ -427,7 +427,7 @@ public class LockServiceImpl implements LockService,
{ {
// Get the current lock owner // Get the current lock owner
String currentUserRef = (String) this.nodeService.getProperty(nodeRef, ContentModel.PROP_LOCK_OWNER); String currentUserRef = (String) this.nodeService.getProperty(nodeRef, ContentModel.PROP_LOCK_OWNER);
String owner = ownableService.getOwner(nodeRef);
if (currentUserRef != null) if (currentUserRef != null)
{ {
Date expiryDate = (Date)this.nodeService.getProperty(nodeRef, ContentModel.PROP_EXPIRY_DATE); Date expiryDate = (Date)this.nodeService.getProperty(nodeRef, ContentModel.PROP_EXPIRY_DATE);
@@ -442,17 +442,12 @@ public class LockServiceImpl implements LockService,
{ {
result = LockStatus.LOCK_OWNER; result = LockStatus.LOCK_OWNER;
} }
else if ((owner != null) && owner.equals(userName))
{
result = LockStatus.LOCK_OWNER;
}
else else
{ {
result = LockStatus.LOCKED; result = LockStatus.LOCKED;
} }
} }
} }
} }
return result; return result;