Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebApplicationObjectSupport's initServletContext will be called only once in any scenario (SPR-6914)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-03-03 16:26:47 +00:00
parent 3c8a47bd06
commit 57993d871e
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.springframework.web.context.support;
import java.io.File;
import javax.servlet.ServletContext;
import org.springframework.context.ApplicationContext;
@@ -42,9 +41,11 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo
public final void setServletContext(ServletContext servletContext) {
this.servletContext = servletContext;
if (servletContext != null) {
initServletContext(servletContext);
if (servletContext != this.servletContext) {
this.servletContext = servletContext;
if (servletContext != null) {
initServletContext(servletContext);
}
}
}
@@ -69,10 +70,10 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo
@Override
protected void initApplicationContext(ApplicationContext context) {
super.initApplicationContext(context);
if (context instanceof WebApplicationContext) {
ServletContext servletContext = ((WebApplicationContext) context).getServletContext();
if (servletContext != null) {
initServletContext(servletContext);
if (this.servletContext == null && context instanceof WebApplicationContext) {
this.servletContext = ((WebApplicationContext) context).getServletContext();
if (this.servletContext != null) {
initServletContext(this.servletContext);
}
}
}