[java-opensaml] 01/02: On FileBacked- resolver init don't use backup data if null or empty.

[Brent Putman]

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

putmanb pushed a commit to branch main
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=8583f50cc2f423d5f89329d86cc47e66605ac9a0

commit 8583f50cc2f423d5f89329d86cc47e66605ac9a0
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Thu Jun 3 19:04:48 2021 -0400

    On FileBacked- resolver init don't use backup data if null or empty.
---
 .../resolver/impl/FileBackedHTTPMetadataResolver.java       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
index ff215b2aa..ed6857108 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
@@ -284,10 +284,15 @@ public class FileBackedHTTPMetadataResolver extends HTTPMetadataResolver {
                         getLogPrefix(), metadataBackupFile.getAbsolutePath());
             try {
                 final byte[] backingData = Files.toByteArray(metadataBackupFile);
-                log.debug("{} Successfully initialized from backup file: {}", 
-                        getLogPrefix(), metadataBackupFile.getAbsolutePath());
-                initializedFromBackupFile = true;
-                return backingData;
+                if (backingData == null || backingData.length == 0) {
+                    log.debug("{} Backup file byte array was null or empty, continuing with normal HTTP fetch: {}", 
+                            getLogPrefix(), metadataBackupFile.getAbsolutePath());
+                } else {
+                    log.debug("{} Successfully initialized from backup file: {}", 
+                            getLogPrefix(), metadataBackupFile.getAbsolutePath());
+                    initializedFromBackupFile = true;
+                    return backingData;
+                }
             } catch (final IOException e) {
                 log.warn("{} Error initializing from backup file, continuing with normal HTTP fetch", 
                         getLogPrefix(), e);

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