[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 Nov 20 22:04:32 2013
New Revision: 1656

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1656&view=rev
Log:
JOST-220: IdP stopping metadata retrieval.
Presumptive fix b/c still haven't confirmed exact behavior users are seeing but this fixes the bug that is the working assumption.

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.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=1656&r1=1655&r2=1656&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Nov 20 22:04:32 2013
@@ -5,6 +5,7 @@
 [JOST-215] - Opensaml1 failed to pass veracode due Use of Wrong Operator in String Comparison (CWE ID 597) 
 [JOST-218] - AbstractMetadataProvider is incorrectly performing an unnecessary validity check and erroneous TRACE message
 [JOST-219] - AbstractReloadingMetadataProvider refresh() is public, should be synchronized for concurrent access
+[JOST-220] - IdP stopping metadata retrieval
 
 Changes in Release 2.6.0
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java?rev=1656&r1=1655&r2=1656&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java Wed Nov 20 22:04:32 2013
@@ -260,10 +260,15 @@
                 log.debug("Processing new metadata from '{}'", mdId);
                 processNewMetadata(mdId, now, mdBytes);
             }
-        } catch (Exception e) {
-            log.debug("Error occurred while attempting to refresh metadata from '" + mdId + "'", e);
+        } catch (Throwable t) {
+            log.debug("Error occurred while attempting to refresh metadata from '" + mdId + "'", t);
             nextRefresh = new DateTime(ISOChronology.getInstanceUTC()).plus(minRefreshDelay);
-            throw new MetadataProviderException(e);
+            if (t instanceof Exception) {
+                throw new MetadataProviderException((Exception) t);
+            } else {
+                throw new MetadataProviderException(String.format("Saw an error of type '%s' with message '%s'", 
+                        t.getClass().getName(), t.getMessage()));
+            }
         } finally {
             refresMetadataTask = new RefreshMetadataTask();
             long nextRefreshDelay = nextRefresh.getMillis() - System.currentTimeMillis();