[java-identity-provider] branch master updated: Compensate for code that was overwriting ResourceLoader.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b29cf2bf02bee66dcb9662d5a9cd98ddce7b40db

The following commit(s) were added to refs/heads/master by this push:
       new  b29cf2b   Compensate for code that was overwriting ResourceLoader.
b29cf2b is described below

commit b29cf2bf02bee66dcb9662d5a9cd98ddce7b40db
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jan 16 17:24:10 2019 -0500

    Compensate for code that was overwriting ResourceLoader.
    
    This fixes the lack of support for conditional resources in some cases.
---
 .../net/shibboleth/idp/test/PreferFileSystemContextLoader.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java b/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
index 2bd5c3c..fd09856 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.test;
 
+import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
 import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
 
 import org.springframework.test.context.web.GenericXmlWebContextLoader;
@@ -38,7 +39,9 @@ public class PreferFileSystemContextLoader extends GenericXmlWebContextLoader {
      */
     @Override protected void customizeContext(GenericWebApplicationContext context,
             WebMergedContextConfiguration webMergedConfig) {
-        context.setResourceLoader(new PreferFileSystemResourceLoader());
+        final PreferFileSystemResourceLoader loader = new PreferFileSystemResourceLoader();
+        loader.addProtocolResolver(new ConditionalResourceResolver());
+        context.setResourceLoader(loader);
     }
 
-}
+}
\ No newline at end of file

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