Skip to content

Commit ecc7ddd

Browse files
committed
Merge branch '6.2.x'
2 parents 121be15 + 2df8ea9 commit ecc7ddd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,8 @@ protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource,
810810
NavigableSet<String> entriesCache = this.jarEntriesCache.get(jarFileUrl);
811811
if (entriesCache != null) {
812812
Set<Resource> result = new LinkedHashSet<>(64);
813+
// Clean root entry path to match jar entries format without "!" separators
814+
rootEntryPath = rootEntryPath.replace(ResourceUtils.JAR_URL_SEPARATOR, "/");
813815
// Search sorted entries from first entry with rootEntryPath prefix
814816
for (String entryPath : entriesCache.tailSet(rootEntryPath, false)) {
815817
if (!entryPath.startsWith(rootEntryPath)) {

0 commit comments

Comments
 (0)