mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to HEAD:
35620: More JUnit Rules Enhancements, covering well known nodes and easier context loading git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -108,7 +108,7 @@ public class ApplicationContextInit extends ExternalResource
|
||||
return new ApplicationContextInit(contextsAsArray);
|
||||
}
|
||||
|
||||
@Override protected void before() throws Throwable
|
||||
@Override protected void before()
|
||||
{
|
||||
// Were any context locations specified in the constructor?
|
||||
if (configLocations.length > 0)
|
||||
@@ -144,6 +144,11 @@ public class ApplicationContextInit extends ExternalResource
|
||||
*/
|
||||
public ApplicationContext getApplicationContext()
|
||||
{
|
||||
if (this.appContext == null)
|
||||
{
|
||||
// Chain order is wrong, try to help out by doing the @Before now
|
||||
before();
|
||||
}
|
||||
return this.appContext;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user