[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:17:29 2016
New Revision: 8086

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8086&view=rev
Log:
IDP-915 - Status page needs to check for failed startup of some components

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

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=8086&r1=8085&r2=8086&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:17:29 2016
@@ -59,68 +59,68 @@
     
     if (((IdentifiedComponent) service).getId().contains("Metadata")) {
         final ServiceableComponent<MetadataResolver> component = service.getServiceableComponent();
-        try {
-            MetadataResolver rootResolver = component.getComponent();
-            Collection<RefreshableMetadataResolver> resolvers = Collections.emptyList();
-            
-            // Step down into wrapping component.
-            if (rootResolver instanceof RelyingPartyMetadataProvider) {
-                rootResolver = ((RelyingPartyMetadataProvider) rootResolver).getEmbeddedResolver();
-            }
-            
-            if (rootResolver instanceof RefreshableMetadataResolver) {
-                resolvers = Collections.<RefreshableMetadataResolver>singletonList((RefreshableMetadataResolver) rootResolver);
-            } else if (rootResolver instanceof ChainingMetadataResolver) {
-            	resolvers = new ArrayList<RefreshableMetadataResolver>();
-                for (final MetadataResolver childResolver : ((ChainingMetadataResolver) rootResolver).getResolvers()) {
-                    if (childResolver instanceof RefreshableMetadataResolver) {
-                        resolvers.add((RefreshableMetadataResolver) childResolver);
+        if (null != component) {
+            try {
+                MetadataResolver rootResolver = component.getComponent();
+                Collection<RefreshableMetadataResolver> resolvers = Collections.emptyList();
+                
+                // Step down into wrapping component.
+                if (rootResolver instanceof RelyingPartyMetadataProvider) {
+                    rootResolver = ((RelyingPartyMetadataProvider) rootResolver).getEmbeddedResolver();
+                }
+                
+                if (rootResolver instanceof RefreshableMetadataResolver) {
+                    resolvers = Collections.<RefreshableMetadataResolver>singletonList((RefreshableMetadataResolver) rootResolver);
+                } else if (rootResolver instanceof ChainingMetadataResolver) {
+                    resolvers = new ArrayList<RefreshableMetadataResolver>();
+                    for (final MetadataResolver childResolver : ((ChainingMetadataResolver) rootResolver).getResolvers()) {
+                        if (childResolver instanceof RefreshableMetadataResolver) {
+                            resolvers.add((RefreshableMetadataResolver) childResolver);
+                        }
                     }
                 }
+                
+                for (final RefreshableMetadataResolver resolver : resolvers) {
+                    final DateTime lastRefresh = resolver.getLastRefresh();
+                    final DateTime lastUpdate = resolver.getLastUpdate();
+    
+                    out.println("\tmetadata source: " + resolver.getId());
+                    if (lastRefresh != null) {
+                        out.println("\tlast refresh attempt: " + lastRefresh.toString(dateTimeFormatter));
+                    }
+                    if (lastUpdate != null) {
+                        out.println("\tlast update: " + lastUpdate.toString(dateTimeFormatter));
+                    }
+                    out.println();
+                }
+            } finally {
+                component.unpinComponent();
             }
-            
-            for (final RefreshableMetadataResolver resolver : resolvers) {
-                final DateTime lastRefresh = resolver.getLastRefresh();
-                final DateTime lastUpdate = resolver.getLastUpdate();
-
-                out.println("\tmetadata source: " + resolver.getId());
-                if (lastRefresh != null) {
-                    out.println("\tlast refresh attempt: " + lastRefresh.toString(dateTimeFormatter));
-                }
-                if (lastUpdate != null) {
-                    out.println("\tlast update: " + lastUpdate.toString(dateTimeFormatter));
-                }
-                out.println();
-            }
-        } finally {
-            if (null != component) {
-                component.unpinComponent();
-            } 
         }
     } else if (((IdentifiedComponent) service).getId().contains("AttributeResolver")) {

[... 45 lines stripped ...]