From 7e736b69b7391f0afee077061fe63c1cd74926ee Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 6 Apr 2017 14:27:00 +0200 Subject: [PATCH] UrlResource applies StringUtils.getFilename against cleaned URL path Issue: SPR-15411 (cherry picked from commit 702e01a) --- .../main/java/org/springframework/core/io/UrlResource.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 584b67f6d84..a4cbb53adb3 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -229,12 +229,11 @@ public class UrlResource extends AbstractFileResolvingResource { /** * This implementation returns the name of the file that this URL refers to. - * @see java.net.URL#getFile() - * @see java.io.File#getName() + * @see java.net.URL#getPath() */ @Override public String getFilename() { - return new File(this.url.getFile()).getName(); + return StringUtils.getFilename(this.cleanedUrl.getPath()); } /**