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

RedirectView and RequestContext use RequestContextUtils.findWebApplicationContext

Browse Source 
Issue: SPR-13346
This commit is contained in:
Juergen Hoeller
2015-08-25 22:16:27 +02:00
parent 7d30017429
commit 4314da922a
6 changed files with 100 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@@ -125,7 +125,11 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo
if (this.servletContext != null) {
return this.servletContext;
}
ServletContext servletContext = getWebApplicationContext().getServletContext();
WebApplicationContext wac = getWebApplicationContext();
if (wac == null) {
return null;
}
ServletContext servletContext = wac.getServletContext();
if (servletContext == null && isContextRequired()) {
throw new IllegalStateException("WebApplicationObjectSupport instance [" + this +
"] does not run within a ServletContext. Make sure the object is fully configured!");