From ddeccadc52766f41fbcd7fa738af805da7226695 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 6 Jul 2011 12:20:50 +0000
Subject: [PATCH] ALF-8583 - Lock Service always returns LOCK_OWNER for Owner.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/lock/LockServiceImpl.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/source/java/org/alfresco/repo/lock/LockServiceImpl.java b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
index 4c5f5ebc8b..5e75a67b20 100644
--- a/source/java/org/alfresco/repo/lock/LockServiceImpl.java
+++ b/source/java/org/alfresco/repo/lock/LockServiceImpl.java
@@ -427,7 +427,7 @@ public class LockServiceImpl implements LockService,
         {
             // Get the current lock owner
             String currentUserRef = (String) this.nodeService.getProperty(nodeRef, ContentModel.PROP_LOCK_OWNER);
-            String owner = ownableService.getOwner(nodeRef);
+
             if (currentUserRef != null)
             {
                 Date expiryDate = (Date)this.nodeService.getProperty(nodeRef, ContentModel.PROP_EXPIRY_DATE);
@@ -442,17 +442,12 @@ public class LockServiceImpl implements LockService,
                     {
                         result = LockStatus.LOCK_OWNER;
                     }
-                    else if ((owner != null) && owner.equals(userName))
-                    {
-                        result = LockStatus.LOCK_OWNER;
-                    }
                     else
                     {
                         result = LockStatus.LOCKED;
                     }
                 }
             }
-
         }
         return result;