Skip to content

S
spring-boot
Commit 49676ee9 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Polish

parent 2cb38bc8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View file @ 49676ee9
...@@ -730,7 +730,7 @@ public class TomcatEmbeddedServletContainerFactory ...@@ -730,7 +730,7 @@ public class TomcatEmbeddedServletContainerFactory
*/ */
private static class StoreMergedWebXmlListener implements LifecycleListener { private static class StoreMergedWebXmlListener implements LifecycleListener {
private final String MERGED_WEB_XML = "org.apache.tomcat.util.scan.MergedWebXml"; private static final String MERGED_WEB_XML = "org.apache.tomcat.util.scan.MergedWebXml";
@Override @Override
public void lifecycleEvent(LifecycleEvent event) { public void lifecycleEvent(LifecycleEvent event) {
...@@ -741,8 +741,8 @@ public class TomcatEmbeddedServletContainerFactory ...@@ -741,8 +741,8 @@ public class TomcatEmbeddedServletContainerFactory
private void onStart(Context context) { private void onStart(Context context) {
ServletContext servletContext = context.getServletContext(); ServletContext servletContext = context.getServletContext();
if (servletContext.getAttribute(this.MERGED_WEB_XML) == null) { if (servletContext.getAttribute(MERGED_WEB_XML) == null) {
servletContext.setAttribute(this.MERGED_WEB_XML, getEmptyWebXml()); servletContext.setAttribute(MERGED_WEB_XML, getEmptyWebXml());
} }
TomcatResources.get(context).addClasspathResources(); TomcatResources.get(context).addClasspathResources();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment