[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml2/metadata/provider/...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Mar 20 21:35:29 2013
New Revision: 1633

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1633&view=rev
Log:
JOST-206: Setting failFastInitialization=false has no effect

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProvider.java
    branches/REL_2/src/test/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProviderTest.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1633&r1=1632&r2=1633&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Mar 20 21:35:29 2013
@@ -19,6 +19,7 @@
 [JOST-201] - SAML1 and 2 base message encoders have incorrect selection logic in getEndpointURL()
 [JOST-203] - Head/body template injection for SAML binding templates
 [JOST-205] - MetadataProvider doesn't report error during refresh if the metadata file doesn't exist any more
+[JOST-206] - Setting failFastInitialization=false has no effect
 
 Changes in Release 2.5.3
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java?rev=1633&r1=1632&r2=1633&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java Wed Mar 20 21:35:29 2013
@@ -412,6 +412,7 @@
                 throw e;
             } else {
                 log.error("Metadata provider failed to properly initializing, continuing on without metadata", e);
+                initialized = true;
             }
         }
     }

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProvider.java?rev=1633&r1=1632&r2=1633&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProvider.java Wed Mar 20 21:35:29 2013
@@ -55,8 +55,7 @@
      * 
      * @param metadata the metadata file
      * 
-     * @throws MetadataProviderException thrown if the given file path is null, does not exist, does not represent a
-     *             file, or if the metadata can not be parsed
+     * @throws MetadataProviderException  this exception is no longer thrown
      */
     public FilesystemMetadataProvider(File metadata) throws MetadataProviderException {
         super();
@@ -69,8 +68,7 @@
      * @param metadata the metadata file
      * @param backgroundTaskTimer timer used to refresh metadata in the background
      * 
-     * @throws MetadataProviderException thrown if the given file path is null, does not exist, does not represent a
-     *             file, or if the metadata can not be parsed
+     * @throws MetadataProviderException  this exception is no longer thrown
      */
     public FilesystemMetadataProvider(Timer backgroundTaskTimer, File metadata) throws MetadataProviderException {
         super(backgroundTaskTimer);
@@ -78,17 +76,13 @@
     }
 
     /**
-     * Sets the file from which metadata is read. The given file path is checked to see if it exists, is a file, and is
-     * readable.
+     * Sets the file from which metadata is read.
      * 
      * @param file path to the metadata file
      * 
-     * @throws MetadataProviderException thrown if the file does not exist or is not a readable file
+     * @throws MetadataProviderException this exception is no longer thrown
      */
     protected void setMetadataFile(File file) throws MetadataProviderException {
-
-        validateMetadataFile(file);
-
         metadataFile = file;
     }
 

Modified: branches/REL_2/src/test/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProviderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProviderTest.java?rev=1633&r1=1632&r2=1633&view=diff
==============================================================================
--- branches/REL_2/src/test/java/org/opensaml/saml2/metadata/provider/FilesystemMetadataProviderTest.java (original)

[... 83 lines stripped ...]