From af593588d3b07dd3bd45bb7c3ad36c44966c0d34 Mon Sep 17 00:00:00 2001 From: Jason <44935830+huyachigege@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:17:37 +0800 Subject: [PATCH] Avoid duplicate resources in PathMatchingResourcePatternResolver on Windows This commit updates PathMatchingResourcePatternResolver to avoid returning duplicate resources on MS Windows when searching using the `classpath*:` prefix and a wildcard pattern that matches resources which are directly present in a JAR as well as present via classpath manifest entries. See gh-31598 Closes gh-31603 (cherry picked from commit d5874ab99ef62b3da8a9269aa526b43328e968a9) --- .../core/io/support/PathMatchingResourcePatternResolver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java index 223c0529196..6f8371f4a76 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java @@ -430,7 +430,8 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol int prefixIndex = filePath.indexOf(':'); if (prefixIndex == 1) { // Possibly "c:" drive prefix on Windows, to be upper-cased for proper duplicate detection - filePath = StringUtils.capitalize(filePath); + // to resolve find duplicate jar resource on windows + filePath = "/" + StringUtils.capitalize(filePath); } // # can appear in directories/filenames, java.net.URL should not treat it as a fragment filePath = StringUtils.replace(filePath, "#", "%23");