[opensaml2] 11/11: SSPCPP-756 Fix self deadlock

[Etienne Dysli Metref]

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

edm-guest pushed a commit to branch master
in repository opensaml2.

commit 1296a4e7e7399286e916a697c08dbea5bbc15151
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Thu Nov 9 16:29:02 2017 +0000

    SSPCPP-756 Fix self deadlock
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-756
    
    When using a Locker to guarda lock and doing the locking oneself,
    it helps to use the correct constructor.
---
 saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp b/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
index 7fe90df..9c4aafa 100644
--- a/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/AbstractDynamicMetadataProvider.cpp
@@ -367,7 +367,7 @@ time_t  AbstractDynamicMetadataProvider::cacheEntity(EntityDescriptor* entity, b
     if (!writeLocked) {
         m_lock->wrlock();
     }
-    Locker locker(writeLocked ? nullptr : const_cast<AbstractDynamicMetadataProvider*>(this));
+    Locker locker(writeLocked ? nullptr : const_cast<AbstractDynamicMetadataProvider*>(this), false);
 
     // Compute the smaller of the validUntil / cacheDuration constraints.
     time_t cacheExp = (entity->getValidUntil() ? entity->getValidUntilEpoch() : SAMLTIME_MAX) - now;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git