root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

restored compatibility with Servlet 2.4 containers on all VMs (SPR-7044)

This commit is contained in:
Juergen Hoeller 2010-03-29 13:17:49 +00:00
parent 63dc53a5ea
commit fa719ad4c5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.web/src/main/java/org/springframework/web/context/ContextLoader.java
View File

@ -34,6 +34,7 @@ import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
/** /**
* Performs the actual initialization work for the root application context. * Performs the actual initialization work for the root application context.
@ -253,16 +254,19 @@ public class ContextLoader {
if (sc.getMajorVersion() == 2 && sc.getMinorVersion() < 5) { if (sc.getMajorVersion() == 2 && sc.getMinorVersion() < 5) {
// Servlet <= 2.4: resort to name specified in web.xml, if any. // Servlet <= 2.4: resort to name specified in web.xml, if any.
String servletContextName = sc.getServletContextName(); String servletContextName = sc.getServletContextName();
if (servletContextName != null) { wac.setId(ConfigurableWebApplicationContext.APPLICATION_CONTEXT_ID_PREFIX +
wac.setId(ConfigurableWebApplicationContext.APPLICATION_CONTEXT_ID_PREFIX + servletContextName); ObjectUtils.getDisplayString(servletContextName));
}
else {
wac.setId(ConfigurableWebApplicationContext.APPLICATION_CONTEXT_ID_PREFIX);
}
} }
else { else {
// Servlet 2.5's getContextPath available! // Servlet 2.5's getContextPath available!
wac.setId(ConfigurableWebApplicationContext.APPLICATION_CONTEXT_ID_PREFIX + sc.getContextPath()); try {
String contextPath = (String) ServletContext.class.getMethod("getContextPath").invoke(sc);
wac.setId(ConfigurableWebApplicationContext.APPLICATION_CONTEXT_ID_PREFIX +
ObjectUtils.getDisplayString(contextPath));
}
catch (Exception ex) {
throw new IllegalStateException("Failed to invoke Servlet 2.5 getContextPath method", ex);
}
} }
wac.setParent(parent); wac.setParent(parent);