[cpp-opensaml COMMIT] in /branches/REL_2/saml: SAMLConfig.cpp binding/impl/ArtifactMap.cpp internal.h saml2/metadata/...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Dec 24 21:59:32 2011
New Revision: 694

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=694&view=rev
Log:
Adjust Lock API

Modified:
    branches/REL_2/saml/SAMLConfig.cpp
    branches/REL_2/saml/binding/impl/ArtifactMap.cpp
    branches/REL_2/saml/internal.h
    branches/REL_2/saml/saml2/metadata/AbstractMetadataProvider.h
    branches/REL_2/saml/saml2/metadata/ObservableMetadataProvider.h
    branches/REL_2/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
    branches/REL_2/saml/saml2/metadata/impl/ChainingMetadataProvider.cpp
    branches/REL_2/saml/saml2/metadata/impl/ObservableMetadataProvider.cpp

Modified: branches/REL_2/saml/SAMLConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/SAMLConfig.cpp?rev=694&r1=693&r2=694&view=diff
==============================================================================
--- branches/REL_2/saml/SAMLConfig.cpp (original)
+++ branches/REL_2/saml/SAMLConfig.cpp Sat Dec 24 21:59:32 2011
@@ -140,7 +140,6 @@
 
 SAMLInternalConfig::~SAMLInternalConfig()
 {
-    delete m_lock;
 }
 
 bool SAMLInternalConfig::init(bool initXMLTooling)

Modified: branches/REL_2/saml/binding/impl/ArtifactMap.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/binding/impl/ArtifactMap.cpp?rev=694&r1=693&r2=694&view=diff
==============================================================================
--- branches/REL_2/saml/binding/impl/ArtifactMap.cpp (original)
+++ branches/REL_2/saml/binding/impl/ArtifactMap.cpp Sat Dec 24 21:59:32 2011
@@ -106,7 +106,7 @@
 
 void ArtifactMappings::storeContent(XMLObject* content, const SAMLArtifact* artifact, const char* relyingParty, int TTL)
 {
-    Lock wrapper(m_lock.get());
+    Lock wrapper(m_lock);
 
     // Garbage collect any expired artifacts.
     time_t now = time(nullptr);
@@ -129,7 +129,7 @@
 XMLObject* ArtifactMappings::retrieveContent(const SAMLArtifact* artifact, const char* relyingParty)
 {
     Category& log=Category::getInstance(SAML_LOGCAT".ArtifactMap");
-    Lock wrapper(m_lock.get());
+    Lock wrapper(m_lock);
 
     map<string,Mapping>::iterator i = m_artMap.find(SAMLArtifact::toHex(artifact->getMessageHandle()));
     if (i == m_artMap.end())

Modified: branches/REL_2/saml/internal.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/internal.h?rev=694&r1=693&r2=694&view=diff
==============================================================================
--- branches/REL_2/saml/internal.h (original)
+++ branches/REL_2/saml/internal.h Sat Dec 24 21:59:32 2011
@@ -111,7 +111,7 @@
 
     private:
         int m_initCount;
-        xmltooling::Mutex* m_lock;
+        std::auto_ptr<xmltooling::Mutex> m_lock;
     };
     /// @endcond
 

Modified: branches/REL_2/saml/saml2/metadata/AbstractMetadataProvider.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/AbstractMetadataProvider.h?rev=694&r1=693&r2=694&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/AbstractMetadataProvider.h (original)
+++ branches/REL_2/saml/saml2/metadata/AbstractMetadataProvider.h Sat Dec 24 21:59:32 2011
@@ -152,7 +152,7 @@
             mutable groupmap_t m_groups;
 
             std::auto_ptr<xmltooling::KeyInfoResolver> m_resolverWrapper;
-            std::auto_ptr<xmltooling::Mutex> m_credentialLock;
+            mutable std::auto_ptr<xmltooling::Mutex> m_credentialLock;
             typedef std::map< const RoleDescriptor*, std::vector<xmltooling::Credential*> > credmap_t;
             mutable credmap_t m_credentialMap;
             const credmap_t::mapped_type& resolveCredentials(const RoleDescriptor& role) const;

Modified: branches/REL_2/saml/saml2/metadata/ObservableMetadataProvider.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/ObservableMetadataProvider.h?rev=694&r1=693&r2=694&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/ObservableMetadataProvider.h (original)
+++ branches/REL_2/saml/saml2/metadata/ObservableMetadataProvider.h Sat Dec 24 21:59:32 2011
@@ -97,7 +97,7 @@
             virtual const Observer* removeObserver(const Observer* oldObserver) const;
 
         private:
-            std::auto_ptr<xmltooling::Mutex> m_observerLock;
+            mutable std::auto_ptr<xmltooling::Mutex> m_observerLock;
             mutable std::vector<const Observer*> m_observers;
         };
 

Modified: branches/REL_2/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp?rev=694&r1=693&r2=694&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/AbstractMetadataProvider.cpp Sat Dec 24 21:59:32 2011
@@ -316,7 +316,7 @@
     if (!metacrit)

[... 97 lines stripped ...]