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
This commit is contained in:
Will Abson
2014-09-03 15:20:13 +00:00
parent 8097a243ca
commit caa836cf1d

View File

@@ -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<QName, Serializable> convertedProperties = filterLockProperties(newProperties);
// Now complete the call by passing the converted properties