root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Polish

Browse Source
pull/6458/head
Phillip Webb 8 years ago
parent 2cb38bc8e2
commit 49676ee986
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
Unescape Escape View File

@ -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
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();
} }

Write Preview
Loading…
Cancel
Save