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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 25 22:31:13 2016
New Revision: 4559

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

https://issues.shibboleth.net/jira/browse/OSJ-182

Wrap timer stop method in a null check to accomodate disabled timer.

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=4559&r1=4558&r2=4559&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	Tue Oct 25 22:31:13 2016
@@ -550,7 +550,9 @@
             try {
                 root = fetchFromOriginSource(criteria);
             } finally {
-                fetchContext.stop();
+                if (fetchContext != null) {
+                    fetchContext.stop();
+                }
             }
             
             if (root == null) {