From 7d2543ed821105d2790db4816e68e3d0a57215be Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 14 Nov 2022 23:53:39 +0100 Subject: [PATCH] Extract filename from cleaned path (for consistent separator handling) See gh-29486 --- .../src/main/java/org/springframework/core/io/UrlResource.java | 3 ++- 1 file changed, 2 insertions(+), 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 index 7038c3026929..8c78fb2382be 100644 --- 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); }