SSPCPP-616 - clean up concatenated string literals

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

diff --git a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
index 7316903..c1ed11c 100644 (file)
--- a/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/DiscoverableMetadataProvider.cpp
@@ -69,17 +69,17 @@ DiscoverableMetadataProvider::DiscoverableMetadataProvider(const DOMElement* e)
                     m_discoFilters.push_back(make_pair(t == "Whitelist", temp));
                 }
                 catch (std::exception& ex) {
-                    Category::getInstance(SAML_LOGCAT".MetadataProvider.Discoverable").error(
+                    Category::getInstance(SAML_LOGCAT ".MetadataProvider.Discoverable").error(
                         "exception creating <DiscoveryFilter> EntityMatcher: %s", ex.what()
                         );
                 }
             }
             else {
-                Category::getInstance(SAML_LOGCAT".MetadataProvider.Discoverable").error("<DiscoveryFilter> requires matcher attribute");
+                Category::getInstance(SAML_LOGCAT ".MetadataProvider.Discoverable").error("<DiscoveryFilter> requires matcher attribute");
             }
         }
         else {
-            Category::getInstance(SAML_LOGCAT".MetadataProvider.Discoverable").error(
+            Category::getInstance(SAML_LOGCAT ".MetadataProvider.Discoverable").error(
                 "unknown <DiscoveryFilter> type (%s)", t.empty() ? "none" : t.c_str()
                 );
         }
@@ -181,6 +181,7 @@ void DiscoverableMetadataProvider::discoEntity(string& s, const EntityDescriptor
             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 @@ void DiscoverableMetadataProvider::discoEntity(string& s, const EntityDescriptor
                             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 @@ void DiscoverableMetadataProvider::discoEntity(string& s, const EntityDescriptor
                 }
             }
 
-            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) {