Merge branch '6.2.x'

spring-projects · Jan 31, 2025 · ecc7ddd · ecc7ddd
2 parents 121be15 + 2df8ea9
commit ecc7ddd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/...rc/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/...rc/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
@@ -810,6 +810,8 @@ protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource,
 			NavigableSet<String> entriesCache = this.jarEntriesCache.get(jarFileUrl);
 			if (entriesCache != null) {
 				Set<Resource> result = new LinkedHashSet<>(64);
+				// Clean root entry path to match jar entries format without "!" separators
+				rootEntryPath = rootEntryPath.replace(ResourceUtils.JAR_URL_SEPARATOR, "/");
 				// Search sorted entries from first entry with rootEntryPath prefix
 				for (String entryPath : entriesCache.tailSet(rootEntryPath, false)) {
 					if (!entryPath.startsWith(rootEntryPath)) {