Remove extra lf from decryption logging.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2770 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/.cproject b/.cproject
index eb08f9e..7ffcb1c 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?fileVersion 4.0.0?>\r
-\r
-<cproject>\r
+<?xml version="1.0" encoding="UTF-8"?><?fileVersion 4.0.0?><cproject>\r

 <storageModule moduleId="org.eclipse.cdt.core.settings">\r
 <cconfiguration id="converted.config.1630818620">\r
 \r
 <storageModule moduleId="org.eclipse.cdt.core.settings">\r
 <cconfiguration id="converted.config.1630818620">\r
 \r

diff --git a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
index 709beda..f5f1cf2 100644 (file)
--- a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
@@ -491,13 +491,13 @@ void XMLExtractor::extractAttributes(
                     MetadataCredentialCriteria mcc(*issuer);
                     auto_ptr<XMLObject> decrypted(encattr->decrypt(*cr, recipient, &mcc));
                     if (m_log.isDebugEnabled())
                     MetadataCredentialCriteria mcc(*issuer);
                     auto_ptr<XMLObject> decrypted(encattr->decrypt(*cr, recipient, &mcc));
                     if (m_log.isDebugEnabled())

-                        m_log.debugStream() << "decrypted Attribute:" << logging::eol << *(decrypted.get()) << logging::eol;
+                        m_log.debugStream() << "decrypted Attribute: " << *(decrypted.get()) << logging::eol;

                     return extractAttributes(application, issuer, *(decrypted.get()), attributes);
                 }
                 else {
                     auto_ptr<XMLObject> decrypted(encattr->decrypt(*cr, recipient));
                     if (m_log.isDebugEnabled())
                     return extractAttributes(application, issuer, *(decrypted.get()), attributes);
                 }
                 else {
                     auto_ptr<XMLObject> decrypted(encattr->decrypt(*cr, recipient));
                     if (m_log.isDebugEnabled())

-                        m_log.debugStream() << "decrypted Attribute:" << logging::eol << *(decrypted.get()) << logging::eol;
+                        m_log.debugStream() << "decrypted Attribute: " << *(decrypted.get()) << logging::eol;

                     return extractAttributes(application, issuer, *(decrypted.get()), attributes);
                 }
             }
                     return extractAttributes(application, issuer, *(decrypted.get()), attributes);
                 }
             }

diff --git a/shibsp/handler/impl/SAML2Consumer.cpp b/shibsp/handler/impl/SAML2Consumer.cpp
index 7064d9e..0a2ebd8 100644 (file)
--- a/shibsp/handler/impl/SAML2Consumer.cpp
+++ b/shibsp/handler/impl/SAML2Consumer.cpp
@@ -231,7 +231,7 @@ void SAML2Consumer::implementProtocol(
                 wrapper.release();
                 ownedtokens.push_back(decrypted);
                 if (m_log.isDebugEnabled())
                 wrapper.release();
                 ownedtokens.push_back(decrypted);
                 if (m_log.isDebugEnabled())

-                    m_log.debugStream() << "decrypted Assertion:" << logging::eol << *decrypted << logging::eol;
+                    m_log.debugStream() << "decrypted Assertion: " << *decrypted << logging::eol;

             }
         }
         catch (exception& ex) {
             }
         }
         catch (exception& ex) {


@@ -323,7 +323,7 @@ void SAML2Consumer::implementProtocol(
                         ownedName = true;
                         decryptedID.release();
                         if (m_log.isDebugEnabled())
                         ownedName = true;
                         decryptedID.release();
                         if (m_log.isDebugEnabled())

-                            m_log.debugStream() << "decrypted NameID:" << logging::eol << *ssoName << logging::eol;
+                            m_log.debugStream() << "decrypted NameID: " << *ssoName << logging::eol;

                     }
                 }
                 catch (exception& ex) {
                     }
                 }
                 catch (exception& ex) {