[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/metadata/resolver/impl/FileBacke...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Apr  1 19:20:39 2016
New Revision: 4441

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4441&view=rev
Log:
OSJ-160: Investigate conditional loading of backing file in FileBackedHTTPMetadataResolver

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java?rev=4441&r1=4440&r2=4441&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java	Fri Apr  1 19:20:39 2016
@@ -163,6 +163,12 @@
         try {
             return super.fetchMetadata();
         } catch (ResolverException e) {
+            if (getCachedOriginalMetadata() != null) {
+                log.warn("Problem reading metadata from remote source; " 
+                        + "detected existing cached metadata, skipping load of backing file");
+                return null;
+            }
+            
             if (metadataBackupFile.exists()) {
                 log.warn("Problem reading metadata from remote source, processing existing backup file: {}", 
                         metadataBackupFile.getAbsolutePath());

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java?rev=4441&r1=4440&r2=4441&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java	(original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java	Fri Apr  1 19:20:39 2016
@@ -224,6 +224,13 @@
         metadataProvider.initialize();
         
         Assert.assertNotNull(metadataProvider.resolveSingle(criteriaSet), "Metadata retrieved from backing file was null");
+        
+        Thread.sleep(1000);
+        
+        // Manually do a refresh here, for testing via log examination that backing file not loaded due to existing cached metadata
+        metadataProvider.refresh();
+        
+        Assert.assertNotNull(metadataProvider.resolveSingle(criteriaSet), "Metadata retrieved from cached metadata was null");
     }
     
     @Test