[#12]

null check
TIER · Feb 28, 2019 · f1becc0 · f1becc0
1 parent 7f51cfc
commit f1becc0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...shibboleth/admin/ui/controller/advice/DurationComparisonValidatingControllerAdvice.groovy b/...shibboleth/admin/ui/controller/advice/DurationComparisonValidatingControllerAdvice.groovy
@@ -27,15 +27,19 @@ class DurationComparisonValidatingControllerAdvice extends RequestBodyAdviceAdap
         MetadataResolver metadataResolver = (MetadataResolver)body
         if (metadataResolver.hasProperty('dynamicMetadataResolverAttributes')) {
             DynamicMetadataResolverAttributes dynamicMetadataResolverAttributes = metadataResolver.dynamicMetadataResolverAttributes
-            if (DurationUtility.toMillis(dynamicMetadataResolverAttributes.minCacheDuration) > DurationUtility.toMillis(dynamicMetadataResolverAttributes.maxCacheDuration)) {
-                throw new MetadataResolverConfigurationValidationException('minimum cache duration larger than maximum')
+            if (dynamicMetadataResolverAttributes != null) {
+                if (DurationUtility.toMillis(dynamicMetadataResolverAttributes.minCacheDuration) > DurationUtility.toMillis(dynamicMetadataResolverAttributes.maxCacheDuration)) {
+                    throw new MetadataResolverConfigurationValidationException('minimum cache duration larger than maximum')
+                }
             }
         }
 
         if (metadataResolver.hasProperty('reloadableMetadataResolverAttributes')) {
             ReloadableMetadataResolverAttributes reloadableMetadataResolverAttributes = metadataResolver.reloadableMetadataResolverAttributes
-            if (DurationUtility.toMillis(reloadableMetadataResolverAttributes.minRefreshDelay) > DurationUtility.toMillis(reloadableMetadataResolverAttributes.maxRefreshDelay)) {
-                throw new MetadataResolverConfigurationValidationException('minimum refresh delay duration larger than maximum')
+            if (reloadableMetadataResolverAttributes != null) {
+                if (DurationUtility.toMillis(reloadableMetadataResolverAttributes.minRefreshDelay) > DurationUtility.toMillis(reloadableMetadataResolverAttributes.maxRefreshDelay)) {
+                    throw new MetadataResolverConfigurationValidationException('minimum refresh delay duration larger than maximum')
+                }
             }
         }