Fixed merge issue in ContentDiskDriverTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-05-22 05:30:19 +00:00
parent 5346073135
commit 13a5830aae

View File

@@ -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");