[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb  4 12:53:08 2016
New Revision: 8087

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8087&view=rev
Log:
IDP-916 - Status page does not report state of chained metadata sources

https://issues.shibboleth.net/jira/browse/IDP-916

Modified:
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp

Modified: trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp?rev=8087&r1=8086&r2=8087&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp	(original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp	Thu Feb  4 12:53:08 2016
@@ -69,15 +69,15 @@
                     rootResolver = ((RelyingPartyMetadataProvider) rootResolver).getEmbeddedResolver();
                 }
                 
-                if (rootResolver instanceof RefreshableMetadataResolver) {
-                    resolvers = Collections.<RefreshableMetadataResolver>singletonList((RefreshableMetadataResolver) rootResolver);
-                } else if (rootResolver instanceof ChainingMetadataResolver) {
+                if (rootResolver instanceof ChainingMetadataResolver) {
                     resolvers = new ArrayList<RefreshableMetadataResolver>();
                     for (final MetadataResolver childResolver : ((ChainingMetadataResolver) rootResolver).getResolvers()) {
                         if (childResolver instanceof RefreshableMetadataResolver) {
                             resolvers.add((RefreshableMetadataResolver) childResolver);
                         }
                     }
+                } else if (rootResolver instanceof RefreshableMetadataResolver) {
+                    resolvers = Collections.<RefreshableMetadataResolver>singletonList((RefreshableMetadataResolver) rootResolver);
                 }
                 
                 for (final RefreshableMetadataResolver resolver : resolvers) {