Browse Source

getResource can throw IllegalArgumentException

Class.getResource, ClassLoader.getResource, and ClassLoader.getSystemResource will throw IllegalArgumentException if a malformed URL is provided to them.

According to its javadoc, resolveURL should return null if not resolvable, so catch the IllegalArgumentException and return null.
pull/26612/head
Craig Andrews 5 years ago committed by Juergen Hoeller
parent
commit
dee12db50a
  1. 19
      spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java

19
spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java

@ -148,14 +148,19 @@ public class ClassPathResource extends AbstractFileResolvingResource { @@ -148,14 +148,19 @@ public class ClassPathResource extends AbstractFileResolvingResource {
*/
@Nullable
protected URL resolveURL() {
if (this.clazz != null) {
return this.clazz.getResource(this.path);
}
else if (this.classLoader != null) {
return this.classLoader.getResource(this.path);
try {
if (this.clazz != null) {
return this.clazz.getResource(this.path);
}
else if (this.classLoader != null) {
return this.classLoader.getResource(this.path);
}
else {
return ClassLoader.getSystemResource(this.path);
}
}
else {
return ClassLoader.getSystemResource(this.path);
catch (IllegalArgumentException ex) {
return null;
}
}

Loading…
Cancel
Save