From af0a529bb509ce8284fd62b4caca946a0cc24a9a Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 9 Nov 2009 18:27:10 +0000 Subject: [PATCH] SPR-6102 + loosen FrameworkServlet#createWebApplicationContext signature --- .../java/org/springframework/web/servlet/FrameworkServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f4fefa85551..8f2a98cd479 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 @@ -397,7 +397,7 @@ public abstract class FrameworkServlet extends HttpServletBean * @return the WebApplicationContext for this servlet * @see org.springframework.web.context.support.XmlWebApplicationContext */ - protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { + protected WebApplicationContext createWebApplicationContext(ApplicationContext parent) { Class contextClass = getContextClass(); if (this.logger.isDebugEnabled()) { this.logger.debug("Servlet with name '" + getServletName() +