[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynam...

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Nov  7 19:28:59 2016
New Revision: 4573

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4573&view=rev
Log:
OSJ-182: Add Metrics instrumentation to dynamic metadata resolvers

Fix reporting issue where when metadata was successfully filtered out (filter returns null),
this is being reported as a "loaded" case.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java?rev=4573&r1=4572&r2=4573&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java	Mon Nov  7 19:28:59 2016
@@ -664,7 +664,11 @@
         if (filteredMetadata == null) {
             log.info("Metadata filtering process produced a null document, resulting in an empty data set");
             releaseMetadataDOM(root);
-            return;
+            if (fromPersistentCache) {
+                throw new FilterException("Metadata filtering process produced a null XMLObject");
+            } else {
+                return;
+            }
         }
         
         if (filteredMetadata instanceof EntityDescriptor) {