From 5f5774584fb77708e54f2d125b8dfa0d22cc0e98 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 09:59:44 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud) 88174: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 88133: Reverse Merge V4.2-BUG-FIX (4.2.4) 88031: MNT-12414 Action menu renders two 'cancel edit' actions when working copy opened in webdav by second user. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/webdav/WebDAVHelper.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java index 5333285257..3fc10a7f96 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java +++ b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java @@ -53,7 +53,6 @@ import org.alfresco.service.cmr.lock.LockService; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileNotFoundException; -import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.CopyService; import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.service.cmr.repository.NodeRef; @@ -1189,15 +1188,6 @@ public class WebDAVHelper */ public boolean isLockedAndReadOnly(final NodeRef nodeRef) { - NodeRef iNodeRef = nodeRef; - if (getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY)) - { - List targetAssocs = getNodeService().getTargetAssocs(nodeRef, ContentModel.ASSOC_ORIGINAL); - if (targetAssocs.size() == 1) - { - iNodeRef = targetAssocs.get(0).getTargetRef(); - } - } - return LockUtils.isLockedAndReadOnly(iNodeRef, m_serviceRegistry.getLockService()); + return LockUtils.isLockedAndReadOnly(nodeRef, m_serviceRegistry.getLockService()); } }