From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 16 Mar 2012 16:52:14 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/CPPXT-85
X-Git-Tag: 2.5.0~22
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=fe72c750c2b9e1d4163fa450efa323061a92c295

https://issues.shibboleth.net/jira/browse/CPPXT-85
---

diff --git a/saml/saml2/metadata/MetadataCredentialCriteria.h b/saml/saml2/metadata/MetadataCredentialCriteria.h
index 41899ed..e4bace2 100644
--- a/saml/saml2/metadata/MetadataCredentialCriteria.h
+++ b/saml/saml2/metadata/MetadataCredentialCriteria.h
@@ -57,7 +57,6 @@ namespace opensaml {
                 return m_role;
             }
 
-            void reset();
             bool matches(const xmltooling::Credential& credential) const;
 
         private:
diff --git a/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp b/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp
index 04094d7..16a79d2 100644
--- a/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp
+++ b/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp
@@ -43,16 +43,6 @@ MetadataCredentialCriteria::MetadataCredentialCriteria(const RoleDescriptor& rol
     }
 }
 
-void MetadataCredentialCriteria::reset()
-{
-    CredentialCriteria::reset();
-    const EntityDescriptor* entity = dynamic_cast<const EntityDescriptor*>(m_role.getParent());
-    if (entity) {
-        auto_ptr_char name(entity->getEntityID());
-        setPeerName(name.get());
-    }
-}
-
 bool MetadataCredentialCriteria::matches(const Credential& credential) const
 {
     const MetadataCredentialContext* context = dynamic_cast<const MetadataCredentialContext*>(credential.getCredentalContext());