[java-identity-provider] branch master updated: Guava ImmutableMap builder values may not be null, need to guard.

[Brent Putman]

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

putmanb pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a52fddabb7fdc5d4930ca4d82342c60969b8af0e

The following commit(s) were added to refs/heads/master by this push:
       new  a52fdda   Guava ImmutableMap builder values may not be null, need to guard.
a52fdda is described below

commit a52fddabb7fdc5d4930ca4d82342c60969b8af0e
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Jun 23 19:38:59 2017 -0400

    Guava ImmutableMap builder values may not be null, need to guard.
---
 .../metadata/impl/MetadataResolverServiceGaugeSet.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
index 0cef33d..db07d69 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java
@@ -67,7 +67,8 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof RefreshableMetadataResolver) {
+                                    if (resolver instanceof RefreshableMetadataResolver 
+                                            && ((RefreshableMetadataResolver) resolver).getLastUpdate() != null) {
                                         mapBuilder.put(resolver.getId(),
                                                 ((RefreshableMetadataResolver) resolver).getLastUpdate());
                                     }
@@ -89,7 +90,8 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof RefreshableMetadataResolver) {
+                                    if (resolver instanceof RefreshableMetadataResolver 
+                                            && ((RefreshableMetadataResolver) resolver).getLastRefresh() != null) {
                                         mapBuilder.put(resolver.getId(),
                                                 ((RefreshableMetadataResolver) resolver).getLastRefresh());
                                     }
@@ -103,6 +105,7 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                 });
         
         //TODO v4.0.0 - Switch to use RefreshableMetadataResolver when new methods promoted up
+        // Checkstyle: AnonInnerLength OFF
         getMetricMap().put(
                 MetricRegistry.name(DEFAULT_METRIC_NAME, metricName, "successfulRefresh"),
                 new Gauge<Map<String,DateTime>>() {
@@ -112,7 +115,9 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof ExtendedRefreshableMetadataResolver) {
+                                    if (resolver instanceof ExtendedRefreshableMetadataResolver 
+                                            && ((ExtendedRefreshableMetadataResolver) resolver)
+                                                .getLastSuccessfulRefresh()  != null) {
                                         mapBuilder.put(resolver.getId(),
                                                 ((ExtendedRefreshableMetadataResolver) resolver)
                                                     .getLastSuccessfulRefresh());
@@ -125,6 +130,7 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         return mapBuilder.build();
                     }
                 });
+        // Checkstyle: AnonInnerLength ON
         
         //TODO v4.0.0 - Switch to use BatchMetadataResolver when new methods promoted up
         getMetricMap().put(
@@ -136,7 +142,8 @@ public class MetadataResolverServiceGaugeSet extends ReloadableServiceGaugeSet i
                         if (component != null) {
                             try {                                
                                 for (final MetadataResolver resolver : getMetadataResolvers(component.getComponent())) {
-                                    if (resolver instanceof ExtendedBatchMetadataResolver) {
+                                    if (resolver instanceof ExtendedBatchMetadataResolver 
+                                            && ((ExtendedBatchMetadataResolver) resolver).getRootValidUntil() != null) {
                                         mapBuilder.put(resolver.getId(),
                                                 ((ExtendedBatchMetadataResolver) resolver).getRootValidUntil());
                                     }

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