[java-identity-provider] branch master updated: OSJ-249: Enhance FilesystemLoadSaveManager to check file last ...

[Brent Putman]

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

putmanb 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=0d9bc48522a3e07c7cceaa5b42d267cc69d3ebd1

The following commit(s) were added to refs/heads/master by this push:
       new  0d9bc48   OSJ-249: Enhance FilesystemLoadSaveManager to check file last ...
0d9bc48 is described below

commit 0d9bc48522a3e07c7cceaa5b42d267cc69d3ebd1
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Sep 28 21:48:50 2018 -0400

    OSJ-249: Enhance FilesystemLoadSaveManager to check file last ...
    
    Change recent API addition to have conditional load flag passed as
    ctor arg rather than setter.  We don't want this changing after
    construction.
---
 .../relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java  | 2 +-
 idp-schema/src/main/resources/schema/shibboleth-metadata.xsd            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java
index e378bde..2a298fe 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java
@@ -74,7 +74,7 @@ public class LocalDynamicMetadataProviderParser extends AbstractDynamicMetadataP
                     BeanDefinitionBuilder.genericBeanDefinition(FilesystemLoadSaveManager.class);
             sourceManagerBuilder.addConstructorArgValue(
                     StringSupport.trimOrNull(element.getAttributeNS(null, "sourceDirectory")));
-            sourceManagerBuilder.addPropertyValue("loadConditionally", "true");
+            sourceManagerBuilder.addConstructorArgValue(Boolean.TRUE);
             sourceManagerRefOrBean = sourceManagerBuilder.getBeanDefinition();
             
             if (sourceKeyGeneratorRefOrBean == null) {
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index a6bd175..bcf85e5 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -669,7 +669,7 @@
                             'sourceManagerRef' is also specified.
 
                             The manager will be configured to check and only return data for an entity if unmodified 
-                            since the last request, i.e. with the manager loadConditionally=true.
+                            since the last request, i.e. with the manager parameter conditionalLoad=true.
                             
                             The source key generator function, if otherwise unspecified, will default to generating
                             the SHA-1 digest (encoded as lower-case hexadecimal) of the input criteria entityID, 

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