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

Merge branch '2.2.x' 

Closes gh-21522
This commit is contained in:
Scott Frederick 2020-05-20 13:00:30 -05:00
parent 14ba7442d9 4a812fc29c
commit c5fd09d06d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
View File

@ -50,7 +50,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextException;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.context.ContextLoader;
import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.ServletContextAware; import org.springframework.web.context.ServletContextAware;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
@ -87,6 +86,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
* *
* @author Phillip Webb * @author Phillip Webb
* @author Dave Syer * @author Dave Syer
* @author Scott Frederick
* @since 2.0.0 * @since 2.0.0
* @see AnnotationConfigServletWebServerApplicationContext * @see AnnotationConfigServletWebServerApplicationContext
* @see XmlServletWebServerApplicationContext * @see XmlServletWebServerApplicationContext
@ -270,7 +270,6 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
} }
return; return;
} }
Log logger = LogFactory.getLog(ContextLoader.class);
servletContext.log("Initializing Spring embedded WebApplicationContext"); servletContext.log("Initializing Spring embedded WebApplicationContext");
try { try {
servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this); servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this);