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

Polish resource handling tests

Browse Source
This commit is contained in:
Rossen Stoyanchev
2014-10-14 11:34:28 -04:00
parent 859e1e8003
commit fa4ba2a82b
5 changed files with 192 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java
View File

@@ -76,15 +76,15 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
protected String resolveUrlPath(String resourcePath, HttpServletRequest request,
Resource resource, ResourceTransformerChain transformerChain) {
if (!resourcePath.startsWith("/")) {
// try resolving as relative path
return transformerChain.getResolverChain().resolveUrlPath(resourcePath, Arrays.asList(resource));
}
else {
if (resourcePath.startsWith("/")) {
// full resource path
ResourceUrlProvider urlProvider = findResourceUrlProvider(request);
return (urlProvider != null ? urlProvider.getForRequestUrl(request, resourcePath) : null);
}
else {
// try resolving as relative path
return transformerChain.getResolverChain().resolveUrlPath(resourcePath, Arrays.asList(resource));
}
}
private ResourceUrlProvider findResourceUrlProvider(HttpServletRequest request) {