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

Polish file locations in resource handling

Browse Source 
Issue: SPR-12747
This commit is contained in:
Brian Clozel
2015-02-26 17:16:44 +01:00
parent 2beca4d75e
commit cbe4a49b54
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
View File

@@ -179,8 +179,10 @@ public class PathResourceResolver extends AbstractResourceResolver {
resourcePath = resource.getURL().getPath(); resourcePath = resource.getURL().getPath();
locationPath = StringUtils.cleanPath(location.getURL().getPath()); locationPath = StringUtils.cleanPath(location.getURL().getPath());
} }
locationPath = (StringUtils.getFilenameExtension(locationPath) != null if(locationPath.equals(resourcePath)) {
|| locationPath.endsWith("/") || locationPath.isEmpty() ? locationPath : locationPath + "/"); return true;
}
locationPath = (locationPath.endsWith("/") || locationPath.isEmpty() ? locationPath : locationPath + "/");
if (!resourcePath.startsWith(locationPath)) { if (!resourcePath.startsWith(locationPath)) {
return false; return false;
} }