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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-07-13 09:39:29 +02:00
parent d17d6374f0 e6ea28dec5
commit fa171671b1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
View File

@ -299,16 +299,16 @@ public final class EndpointRequest {
List<RequestMatcher> antPath(String... parts) {
List<RequestMatcher> matchers = new ArrayList<>();
this.servletPaths.stream().map((p) -> {
if (StringUtils.hasText(p)) {
if (StringUtils.hasText(p) && !p.equals("/")) {
return p;
}
return "";
}).distinct().forEach((path) -> {
String pattern = (path.equals("/") ? "" : path);
StringBuilder pattern = new StringBuilder(path);
for (String part : parts) {
pattern += part;
pattern.append(part);
}
matchers.add(new AntPathRequestMatcher(pattern));
matchers.add(new AntPathRequestMatcher(pattern.toString()));
});
return matchers;
}