[spring-extensions] branch master updated: Custom ResourceLoader is missing ConditionalResourceResolver.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=b41326b88d65767b7491e7e505e66b09e86fedbb

The following commit(s) were added to refs/heads/master by this push:
       new  b41326b   Custom ResourceLoader is missing ConditionalResourceResolver.
b41326b is described below

commit b41326b88d65767b7491e7e505e66b09e86fedbb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 12 13:22:20 2020 -0400

    Custom ResourceLoader is missing ConditionalResourceResolver.
---
 .../net/shibboleth/ext/spring/util/ApplicationContextBuilder.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java b/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
index 0f82236..24a4783 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
@@ -35,6 +35,7 @@ import net.shibboleth.ext.spring.config.StringToDurationConverter;
 import net.shibboleth.ext.spring.config.StringToIPRangeConverter;
 import net.shibboleth.ext.spring.config.StringToResourceConverter;
 import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
 import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -295,7 +296,9 @@ public class ApplicationContextBuilder {
         final FilesystemGenericApplicationContext context = new FilesystemGenericApplicationContext(parentContext);
         context.setDisplayName("ApplicationContext:" + (contextName != null ? contextName : "anonymous"));
         
-        context.setResourceLoader(new PreferFileSystemResourceLoader());
+        final PreferFileSystemResourceLoader loader = new PreferFileSystemResourceLoader();
+        loader.addProtocolResolver(new ConditionalResourceResolver());
+        context.setResourceLoader(loader);
         
         if (conversionService != null) {
             context.getBeanFactory().setConversionService(conversionService);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.