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

Restore JDK 5 compatiblity

Browse Source
This commit is contained in:
Stephane Nicoll
2014-12-30 15:31:13 +01:00
parent 75a9c45865
commit 4bcf92f176
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@@ -315,7 +315,8 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
resourcePath = resource.getURL().getPath();
locationPath = location.getURL().getPath();
}
locationPath = (locationPath.endsWith("/") || locationPath.isEmpty() ? locationPath : locationPath + "/");
locationPath = (locationPath.endsWith("/") ||
!StringUtils.hasText(locationPath) ? locationPath : locationPath + "/");
if (!resourcePath.startsWith(locationPath)) {
return false;
}