diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java index 8f2a98cd47..6b7b00d311 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/FrameworkServlet.java @@ -445,6 +445,20 @@ public abstract class FrameworkServlet extends HttpServletBean return wac; } + /** + * Instantiate the WebApplicationContext for this servlet, either a default + * {@link org.springframework.web.context.support.XmlWebApplicationContext} + * or a {@link #setContextClass custom context class}, if set. + * Delegates to #createWebApplicationContext(ApplicationContext). + * @param parent the parent WebApplicationContext to use, or null if none + * @return the WebApplicationContext for this servlet + * @see org.springframework.web.context.support.XmlWebApplicationContext + * @see #createWebApplicationContext(ApplicationContext) + */ + protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { + return createWebApplicationContext((ApplicationContext) parent); + } + /** * Post-process the given WebApplicationContext before it is refreshed * and activated as context for this servlet.