ResourcePatternUtils provides plain PathMatchingResourcePatternResolver in case of a null ResourceLoader

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3213 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -54,7 +54,7 @@ public abstract class ResourcePatternUtils {
 	 * ResourcePatternResolver extension, or a PathMatchingResourcePatternResolver
 	 * built on the given ResourceLoader.
 	 * @param resourceLoader the ResourceLoader to build a pattern resolver for
-	 * (not <code>null</code>)
+	 * (may be <code>null</code> to indicate a default ResourceLoader)
 	 * @return the ResourcePatternResolver
 	 * @see PathMatchingResourcePatternResolver
 	 */
@@ -63,9 +63,12 @@ public abstract class ResourcePatternUtils {
 		if (resourceLoader instanceof ResourcePatternResolver) {
 			return (ResourcePatternResolver) resourceLoader;
 		}
-		else {
+		else if (resourceLoader != null) {
 			return new PathMatchingResourcePatternResolver(resourceLoader);
 		}
+		else {
+			return new PathMatchingResourcePatternResolver();
+		}
 	}
 
 }

org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -151,9 +151,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
 	}
 
 	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourcePatternResolver = (resourceLoader != null ?
-				ResourcePatternUtils.getResourcePatternResolver(resourceLoader) :
-				new PathMatchingResourcePatternResolver());
+		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}
 
 

org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java

@@ -250,9 +250,7 @@ public class DefaultPersistenceUnitManager
 	}
 
 	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourcePatternResolver = (resourceLoader != null ?
-				ResourcePatternUtils.getResourcePatternResolver(resourceLoader) :
-				new PathMatchingResourcePatternResolver());
+		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}