From 418c658ac74dcafb13ecdb856cedd2bc6705f358 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 3 Jun 2016 16:00:23 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 124229 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124146 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) 124109 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124108 amorarasu: MNT-15801 : onContentUpdate policies not working for updates via webdav - Fixed code merged from 4.1.N, a different LockInfo method is used. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/webdav/PutMethod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/webdav/PutMethod.java b/source/java/org/alfresco/repo/webdav/PutMethod.java index a0eb1fe221..fe6fac9f7f 100644 --- a/source/java/org/alfresco/repo/webdav/PutMethod.java +++ b/source/java/org/alfresco/repo/webdav/PutMethod.java @@ -249,7 +249,7 @@ public class PutMethod extends WebDAVMethod implements ActivityPostProducer // Note, for MNT-15801, that the aspect is only applied if: // - the node is locked AND // - the node does not have any content (zero length binaries included) - if (nodeLockInfo != null && nodeLockInfo.getToken() != null && !(ContentData.hasContent(contentData) && contentData.getSize() > 0)) + if (nodeLockInfo != null && nodeLockInfo.isExclusive() && !(ContentData.hasContent(contentData) && contentData.getSize() > 0)) { getNodeService().addAspect(contentNodeInfo.getNodeRef(), ContentModel.ASPECT_NO_CONTENT, null); }