From a81325bbbc75f9ae313ff83be7a9aab3324bf03a Mon Sep 17 00:00:00 2001 From: adavid9 Date: Tue, 16 Jul 2019 19:00:03 +0200 Subject: [PATCH] Hide loader classes from Tomcat's ServletContext resource paths See gh-17538 --- .../web/embedded/tomcat/TomcatServletWebServerFactory.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java index 437dfc59917..f599f210660 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java @@ -31,6 +31,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Set; +import java.util.stream.Collectors; import javax.servlet.ServletContainerInitializer; @@ -88,6 +89,7 @@ import org.springframework.util.StringUtils; * @author Andy Wilkinson * @author Eddú Meléndez * @author Christoffer Sawicki + * @author Dawid Antecki * @since 2.0.0 * @see #setPort(int) * @see #setContextLifecycleListeners(Collection) @@ -751,7 +753,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto @Override public Set listWebAppPaths(String path) { - return this.delegate.listWebAppPaths(path); + return this.delegate.listWebAppPaths(path).stream() + .filter((p) -> !p.startsWith("org/springframework/boot/loader")).collect(Collectors.toSet()); } @Override