Fix race condition during shutdown.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / XMLMetadataProvider.cpp

diff --git a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
index 9c1c6b6..be76358 100644 (file)
--- a/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
@@ -53,7 +53,12 @@ namespace opensaml {
                     m_object(NULL), m_maxCacheDuration(m_reloadInterval) {
             }
             virtual ~XMLMetadataProvider() {
+                if (m_lock)
+                    m_lock->wrlock();
                 delete m_object;
+                m_object = NULL;
+                if (m_lock)
+                    m_lock->unlock();
             }
 
             void init() {