Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

59253: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59199: Reverse Merged as it caused regression MNT-10075
         55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
             55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:17:23 +00:00
parent 361b3abd03
commit 6745a4ac5f
2 changed files with 1 additions and 11 deletions

View File

@@ -1135,14 +1135,4 @@ public class WebDAVHelper
{
return LockUtils.isLockedAndReadOnly(nodeRef, m_serviceRegistry.getLockService());
}
/**
* Indicates if the node is locked and the current user is not lock owner<p>
*
* @param nodeRef the node reference
*/
public boolean isLockedAndNotLockOwner(final NodeRef nodeRef)
{
return LockUtils.isLockedAndNotLockOwner(nodeRef, m_serviceRegistry.getLockService());
}
}