From 13a5830aaef7ca8561e0d5ea00601abbebfc8811 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Sun, 22 May 2011 05:30:19 +0000 Subject: [PATCH] Fixed merge issue in ContentDiskDriverTest git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/filesys/repo/ContentDiskDriverTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java index 13e9c6af05..797789529e 100644 --- a/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java +++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriverTest.java @@ -115,8 +115,8 @@ public class ContentDiskDriverTest extends TestCase applicationContext = ApplicationContextHelper.getApplicationContext(); repositoryHelper = (Repository)this.applicationContext.getBean("repositoryHelper"); ApplicationContextFactory fileServers = (ApplicationContextFactory) this.applicationContext.getBean("fileServers"); - cifsHelper = (CifsHelper) this.applicationContext.getBean("cifsHelper"); - driver = (ContentDiskDriver)this.applicationContext.getBean("contentDiskDriver"); + cifsHelper = (CifsHelper) fileServers.getApplicationContext().getBean("cifsHelper"); + driver = (ContentDiskDriver) fileServers.getApplicationContext().getBean("contentDiskDriver"); mlAwareNodeService = (NodeService) this.applicationContext.getBean("mlAwareNodeService"); nodeService = (NodeService)applicationContext.getBean("nodeService"); transactionService = (TransactionService)applicationContext.getBean("transactionService");