From 06342b82d66037bab35219c3994982857f2125e1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 1 Apr 2010 10:35:49 +0000 Subject: [PATCH] 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 --- .../core/io/support/ResourcePatternUtils.java | 9 ++++++--- .../annotation/AnnotationSessionFactoryBean.java | 6 ++---- .../persistenceunit/DefaultPersistenceUnitManager.java | 4 +--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java b/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java index 0ee5078986a..702b4be64e7 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java +++ b/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 null) + * (may be null 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(); + } } } diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java index bff19d26c71..975f34e0e05 100644 --- a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java +++ b/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); } diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java b/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java index cc5db6c1b90..b845ce38e47 100644 --- a/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/DefaultPersistenceUnitManager.java +++ b/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); }