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

avoid NPE in PathMatchingResourcePatternResolver when initialized with null ClassLoader

Browse Source
This commit is contained in:
Juergen Hoeller
2009-02-12 23:46:17 +00:00
parent d6ed6fcd3f
commit 647495edd3
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -74,15 +74,13 @@ public class DefaultResourceLoader implements ResourceLoader {
}
/**
* Return the ClassLoader to load class path resources with,
* or <code>null</code> if using the thread context class loader on actual access
* (applying to the thread that constructs the ClassPathResource object).
* Return the ClassLoader to load class path resources with.
* <p>Will get passed to ClassPathResource's constructor for all
* ClassPathResource objects created by this resource loader.
* @see ClassPathResource
*/
public ClassLoader getClassLoader() {
return this.classLoader;
return (this.classLoader != null ? this.classLoader : ClassUtils.getDefaultClassLoader());
}

3
org.springframework.core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -198,6 +198,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
* Create a new PathMatchingResourcePatternResolver with a DefaultResourceLoader.
* @param classLoader the ClassLoader to load classpath resources with,
* or <code>null</code> for using the thread context class loader
* at the time of actual resource access
* @see org.springframework.core.io.DefaultResourceLoader
*/
public PathMatchingResourcePatternResolver(ClassLoader classLoader) {