From caa836cf1dbe772dba7fc258a3b17564b497a313 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 3 Sep 2014 15:20:13 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 79306: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 79078: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4) 78985: MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco - Fixed property comparison git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/lock/mem/LockableAspectInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java b/source/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java index d9d28eea8d..c26b698b64 100644 --- a/source/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java +++ b/source/java/org/alfresco/repo/lock/mem/LockableAspectInterceptor.java @@ -193,7 +193,7 @@ public class LockableAspectInterceptor implements MethodInterceptor /* MNT-10477 fix */ checkForLockIfEphemeral(nodeRef); - if (newProperties.get(ContentModel.PROP_LOCK_LIFETIME) == Lifetime.EPHEMERAL) + if (Lifetime.EPHEMERAL.toString().equals(newProperties.get(ContentModel.PROP_LOCK_LIFETIME))) { Map convertedProperties = filterLockProperties(newProperties); // Now complete the call by passing the converted properties