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

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2024-07-11 16:16:31 +02:00
parent 022b91980e 2bfff7fc37
commit d1f9e35b35
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,12 +445,18 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
if (!cleanedPath.equals(urlString)) { if (!cleanedPath.equals(urlString)) {
// Prefer cleaned URL, aligned with UrlResource#createRelative(String) // Prefer cleaned URL, aligned with UrlResource#createRelative(String)
try { try {
return new UrlResource(ResourceUtils.toURI(cleanedPath)); // Cannot test for URLStreamHandler directly: URL equality for same String
// in order to find out whether original URL uses default URLStreamHandler.
if (ResourceUtils.toURL(urlString).equals(url)) {
// Plain URL with default URLStreamHandler -> replace with cleaned path.
return new UrlResource(ResourceUtils.toURI(cleanedPath));
}
} }
catch (URISyntaxException | MalformedURLException ex) { catch (URISyntaxException | MalformedURLException ex) {
// Fallback to regular URL construction below... // Fallback to regular URL construction below...
} }
} }
// Retain original URL instance, potentially including custom URLStreamHandler.
return new UrlResource(url); return new UrlResource(url);
} }
} }