Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore directory matching (explicitly excluding root path itself)

Browse Source 
Closes gh-29333
This commit is contained in:
Juergen Hoeller
2022-10-18 19:29:29 +02:00
parent d89865ad67
commit d17cdf98bb
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View File

@@ -781,8 +781,9 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
rootDir += "/";
}
Path rootPathForPattern = rootPath;
String resourcePattern = rootDir + StringUtils.cleanPath(subPattern);
Predicate<Path> isMatchingFile = path -> (Files.isRegularFile(path) &&
Predicate<Path> isMatchingFile = path -> (!path.equals(rootPathForPattern) &&
getPathMatcher().match(resourcePattern, StringUtils.cleanPath(path.toString())));
if (logger.isTraceEnabled()) {