[spring-extensions] branch master updated: Plug some gaps where conditional protocol resolver wasn't injected.

[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=90f6c0d5558ff5672de53d244b0a34b3831702e7

The following commit(s) were added to refs/heads/master by this push:
       new  90f6c0d   Plug some gaps where conditional protocol resolver wasn't injected.
90f6c0d is described below

commit 90f6c0d5558ff5672de53d244b0a34b3831702e7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jan 16 17:11:12 2019 -0500

    Plug some gaps where conditional protocol resolver wasn't injected.
---
 .../ext/spring/context/FilesystemGenericApplicationContext.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
index 5f4dcb8..090c6b7 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
@@ -46,6 +46,7 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
     public FilesystemGenericApplicationContext(final DefaultListableBeanFactory beanFactory) {
         super(beanFactory);
         beanFactory.setParameterNameDiscoverer(new AnnotationParameterNameDiscoverer());
+        addProtocolResolver(new ConditionalResourceResolver());
     }
 
     /**
@@ -56,6 +57,7 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
     public FilesystemGenericApplicationContext(final ApplicationContext parent) {
         super(parent);
         getDefaultListableBeanFactory().setParameterNameDiscoverer(new AnnotationParameterNameDiscoverer());
+        addProtocolResolver(new ConditionalResourceResolver());
     }
 
     /**
@@ -68,6 +70,7 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
             final ApplicationContext parent) {
         super(beanFactory, parent);
         beanFactory.setParameterNameDiscoverer(new AnnotationParameterNameDiscoverer());
+        addProtocolResolver(new ConditionalResourceResolver());
     }
 
     /**

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