SSPCPP-616 - clean up concatenated string literals

[shibboleth/cpp-sp.git] / shibsp / binding / impl / ArtifactResolver.cpp

diff --git a/shibsp/binding/impl/ArtifactResolver.cpp b/shibsp/binding/impl/ArtifactResolver.cpp
index 73aac7e..edff5c5 100644 (file)
--- a/shibsp/binding/impl/ArtifactResolver.cpp
+++ b/shibsp/binding/impl/ArtifactResolver.cpp
@@ -113,7 +113,7 @@ saml1p::Response* ArtifactResolver::resolve(
             response = client.receiveSAML();
         }
         catch (std::exception& ex) {
-            Category::getInstance(SHIBSP_LOGCAT".ArtifactResolver").error("exception resolving SAML 1.x artifact(s): %s", ex.what());
+            Category::getInstance(SHIBSP_LOGCAT ".ArtifactResolver").error("exception resolving SAML 1.x artifact(s): %s", ex.what());
             soaper.reset();
         }
     }
@@ -140,7 +140,7 @@ ArtifactResponse* ArtifactResolver::resolve(
     opensaml::SecurityPolicy& policy
     ) const
 {
-    Category& log = Category::getInstance(SHIBSP_LOGCAT".ArtifactResolver");
+    Category& log = Category::getInstance(SHIBSP_LOGCAT ".ArtifactResolver");
 
     MetadataCredentialCriteria mcc(ssoDescriptor);
     shibsp::SecurityPolicy& sppolicy = dynamic_cast<shibsp::SecurityPolicy&>(policy);
@@ -208,14 +208,10 @@ ArtifactResponse* ArtifactResolver::resolve(
                             XercesJanitor<DOMDocument> docjanitor(doc);
 
                             if (log.isDebugEnabled()) {
-#ifdef XMLTOOLING_LOG4SHIB
-                                log.debugStream() << "received XML:\n" << *(doc->getDocumentElement()) << logging::eol;
-#else
                                 string buf;
                                 XMLHelper::serialize(doc->getDocumentElement(), buf);
                                 log.debugStream() << "received XML:\n" << buf << logging::eol;
-#endif
-    }
+                            }
                             xmlObject.reset(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
                             docjanitor.release();
                         }