store a static WebApplicationContext reference if the Spring jars get deployed in the same web application as the ContextLoader (SPR-5652)
This commit is contained in:
parent
db2d323d96
commit
87eb3f970e
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2002-2009 the original author or authors.
|
* Copyright 2002-2010 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|
@ -61,6 +61,7 @@ public final class ContextLoaderTests {
|
||||||
listener.contextInitialized(event);
|
listener.contextInitialized(event);
|
||||||
WebApplicationContext context = (WebApplicationContext) sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
|
WebApplicationContext context = (WebApplicationContext) sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
|
||||||
assertTrue("Correct WebApplicationContext exposed in ServletContext", context instanceof XmlWebApplicationContext);
|
assertTrue("Correct WebApplicationContext exposed in ServletContext", context instanceof XmlWebApplicationContext);
|
||||||
|
assertTrue(ContextLoader.getCurrentWebApplicationContext() instanceof XmlWebApplicationContext);
|
||||||
LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle");
|
LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle");
|
||||||
assertTrue("Has father", context.containsBean("father"));
|
assertTrue("Has father", context.containsBean("father"));
|
||||||
assertTrue("Has rod", context.containsBean("rod"));
|
assertTrue("Has rod", context.containsBean("rod"));
|
||||||
|
|
@ -70,6 +71,8 @@ public final class ContextLoaderTests {
|
||||||
assertFalse(context.containsBean("beans1.bean2"));
|
assertFalse(context.containsBean("beans1.bean2"));
|
||||||
listener.contextDestroyed(event);
|
listener.contextDestroyed(event);
|
||||||
assertTrue("Destroyed", lb.isDestroyed());
|
assertTrue("Destroyed", lb.isDestroyed());
|
||||||
|
assertNull(sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE));
|
||||||
|
assertNull(ContextLoader.getCurrentWebApplicationContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue