From 68bfd2b72e25c57e6064eb640f3b354823b3a824 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 01:03:54 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 59120: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 59105: Fix broken tests in LockableAspectInterceptorTest. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62100 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 8f91b1c08d..63c905b522 100644 --- a/source/test-java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java +++ b/source/test-java/org/alfresco/repo/lock/mem/LockableAspectInterceptorTest.java @@ -62,7 +62,7 @@ public class LockableAspectInterceptorTest userName = AuthenticationUtil.getAdminUserName(); AuthenticationUtil.setFullyAuthenticatedUser(userName); nodeService = (NodeService) appCtx.getBean("NodeService"); - rawNodeService = (NodeService) appCtx.getBean("mlAwareNodeService"); + rawNodeService = (NodeService) appCtx.getBean("dbNodeService"); lockStore = (LockStore) appCtx.getBean("lockStore"); rootNode = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE); interceptor = (LockableAspectInterceptor) appCtx.getBean("lockableAspectInterceptor");