From 387eb1b37ca3d13014d962fe2db5cd9eb6782c1e Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 3 Sep 2014 15:20:22 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 79307: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 79080: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4) 78999: MNT-12049 : After uploading a document via WebDAV using DnD or copy/paste, the document appears as locked to Alfresco - Fixed build failure git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/lock/mem/LockableAspectInterceptorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java b/source/test-java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java index 80afd755a9..23c9c987ea 100644 --- a/source/test-java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java +++ b/source/test-java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java @@ -431,7 +431,7 @@ public class LockableAspectInterceptorTest properties.put(ContentModel.PROP_NAME, "A Name"); // Lock properties should not be persisted (filtered out by interceptor) properties.put(ContentModel.PROP_LOCK_TYPE, LockType.NODE_LOCK); - properties.put(ContentModel.PROP_LOCK_LIFETIME, Lifetime.EPHEMERAL); + properties.put(ContentModel.PROP_LOCK_LIFETIME, Lifetime.EPHEMERAL.toString()); properties.put(ContentModel.PROP_LOCK_OWNER, "Alison Bloggs"); Date expiryDate = new Date(); properties.put(ContentModel.PROP_EXPIRY_DATE, expiryDate);