Merge branch '2.2.x'

Closes gh-21522
spring-projects · May 20, 2020 · c5fd09d · c5fd09d
2 parents 14ba744 + 4a812fc
commit c5fd09d
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java b/...java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java
@@ -50,7 +50,6 @@
 import org.springframework.context.ApplicationContextException;
 import org.springframework.core.io.Resource;
 import org.springframework.util.StringUtils;
-import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.context.WebApplicationContext;
@@ -87,6 +86,7 @@
  *
  * @author Phillip Webb
  * @author Dave Syer
+ * @author Scott Frederick
  * @since 2.0.0
  * @see AnnotationConfigServletWebServerApplicationContext
  * @see XmlServletWebServerApplicationContext
@@ -270,7 +270,6 @@ protected void prepareWebApplicationContext(ServletContext servletContext) {
 			}
 			return;
 		}
-		Log logger = LogFactory.getLog(ContextLoader.class);
 		servletContext.log("Initializing Spring embedded WebApplicationContext");
 		try {
 			servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this);