[utilities COMMIT] /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter....

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Jun 22 01:41:37 2014
New Revision: 603

URL: http://svn.shibboleth.net/view/utilities?rev=603&view=rev
Log:
If the application context is null, use a DefaultResourceLoader to get the resource.

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java?rev=603&r1=602&r2=603&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java Sun Jun 22 01:41:37 2014
@@ -23,9 +23,13 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.ResourceLoader;
 
 /**
- * Allows setting {@link Resource} properties using a string representing a Spring resource.
+ * Allows setting {@link Resource} properties using a string representing a Spring resource. The Spring resource is
+ * retrieved by the application context. If the application context is null, then a {@link DefaultResourceLoader} is
+ * used instead to get the resource.
  */
 public class StringToResourceConverter implements Converter<String, Resource>, ApplicationContextAware {
 
@@ -34,7 +38,8 @@
 
     /** {@inheritDoc} */
     public Resource convert(String source) {
-        return ResourceHelper.of(applicationContext.getResource(source));
+        final ResourceLoader loader = applicationContext == null ? new DefaultResourceLoader() : applicationContext;
+        return ResourceHelper.of(loader.getResource(source));
     }
 
     /** {@inheritDoc} */