root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polish WebJarsResourceResolver 

Fix a potential NPE when trying to resolve non-existing webjars
resources in the resolver chain.
This commit is contained in:
Brian Clozel 2015-07-27 14:16:09 +02:00
parent 40ea9ffd63
commit accb8519fd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/WebJarsResourceResolver.java
View File

@ -75,8 +75,10 @@ public class WebJarsResourceResolver extends AbstractResourceResolver {
String path = chain.resolveUrlPath(resourceUrlPath, locations); String path = chain.resolveUrlPath(resourceUrlPath, locations);
if (path == null) { if (path == null) {
String webJarResourcePath = findWebJarResourcePath(resourceUrlPath); String webJarResourcePath = findWebJarResourcePath(resourceUrlPath);
if(webJarResourcePath != null) {
return chain.resolveUrlPath(webJarResourcePath, locations); return chain.resolveUrlPath(webJarResourcePath, locations);
} }
}
return path; return path;
} }

1
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/WebJarsResourceResolverTests.java
View File

@ -107,6 +107,7 @@ public class WebJarsResourceResolverTests {
assertNull(actual); assertNull(actual);
verify(this.chain, times(1)).resolveUrlPath(file, this.locations); verify(this.chain, times(1)).resolveUrlPath(file, this.locations);
verify(this.chain, never()).resolveUrlPath(null, this.locations);
} }
@Test @Test