Extract filename from cleaned path (for consistent separator handling)

See gh-29486
spring-projects · Nov 14, 2022 · 7d2543e · 7d2543e
1 parent 588a702
commit 7d2543e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/spring-core/src/main/java/org/springframework/core/io/UrlResource.java b/spring-core/src/main/java/org/springframework/core/io/UrlResource.java
@@ -304,7 +304,8 @@ protected URL createRelativeURL(String relativePath) throws MalformedURLExceptio
 	@Override
 	@Nullable
 	public String getFilename() {
-		String filename = StringUtils.getFilename(this.uri != null ? this.uri.getPath() : this.url.getPath());
+		String originalPath = (this.uri != null ? this.uri.getPath() : this.url.getPath());
+		String filename = StringUtils.getFilename(StringUtils.cleanPath(originalPath));
 		return (filename != null ? URLDecoder.decode(filename, StandardCharsets.UTF_8) : null);
 	}