[cpp-opensaml COMMIT] /branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jan 22 16:32:53 2015
New Revision: 775

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=775&view=rev
Log:
https://issues.shibboleth.net/jira/browse/CPPOST-87

Modified:
    branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp

Modified: branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp?rev=775&r1=774&r2=775&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp Thu Jan 22 16:32:53 2015
@@ -181,6 +181,7 @@
             json_safe(s, entityid.get());
             s += '\"';
             bool extFound = false;
+            bool displayNameFound = false;
             for (indirect_iterator<vector<IDPSSODescriptor*>::const_iterator> idp = make_indirect_iterator(idps.begin());
                     !extFound && idp != make_indirect_iterator(idps.end()); ++idp) {
                 if (idp->isValid(now) && idp->getExtensions()) {
@@ -191,6 +192,7 @@
                             extFound = true;
                             const vector<DisplayName*>& dispnames = info->getDisplayNames();
                             if (!dispnames.empty()) {
+                                displayNameFound = true;
                                 s += ",\n \"DisplayNames\": [";
                                 for (indirect_iterator<vector<DisplayName*>::const_iterator> dispname = make_indirect_iterator(dispnames.begin());
                                         dispname != make_indirect_iterator(dispnames.end()); ++dispname) {
@@ -314,7 +316,7 @@
                 }
             }
 
-            if (m_legacyOrgNames && !extFound) {
+            if (m_legacyOrgNames && !displayNameFound) {
                 const Organization* org = nullptr;
                 for (indirect_iterator<vector<IDPSSODescriptor*>::const_iterator> idp = make_indirect_iterator(idps.begin());
                         !org && idp != make_indirect_iterator(idps.end()); ++idp) {