Reducing header overuse, non-inlining selected methods (CPPOST-35).

[shibboleth/cpp-sp.git] / shibsp / attribute / resolver / impl / DelegationAttributeExtractor.cpp

diff --git a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
index df38e62..d05fb85 100644 (file)
--- a/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/DelegationAttributeExtractor.cpp
@@ -29,6 +29,7 @@
 
 #include <saml/saml2/core/Assertions.h>
 #include <saml/saml2/metadata/MetadataCredentialCriteria.h>
+#include <xmltooling/util/DateTime.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>
 
@@ -148,7 +149,6 @@ void DelegationExtractor::extractAttributes(
                     }
                     catch (exception& ex) {
                         log.error("caught exception decrypting Delegate: %s", ex.what());
-                        return;
                     }
                 }
                 else {
@@ -166,29 +166,29 @@ void DelegationExtractor::extractAttributes(
                         val.addmember("DelegationInstant").string(temp.get());
                     }
 
-                    auto_arrayptr<char> name(toUTF8(n->getName()));\r
-                    if (name.get() && *name.get()) {\r
-                        val.addmember("Name").string(name.get());\r
-                        char* str = toUTF8(n->getFormat());\r
-                        if (str && *str)\r
-                            val.addmember("Format").string(str);\r
-                        delete[] str;\r
-\r
-                        str = toUTF8(n->getNameQualifier());\r
-                        if (str && *str)\r
-                            val.addmember("NameQualifier").string(str);\r
-                        delete[] str;\r
-\r
-                        str = toUTF8(n->getSPNameQualifier());\r
-                        if (str && *str)\r
-                            val.addmember("SPNameQualifier").string(str);\r
-                        delete[] str;\r
-\r
-                        str = toUTF8(n->getSPProvidedID());\r
-                        if (str && *str)\r
-                            val.addmember("SPProvidedID").string(str);\r
-                        delete[] str;\r
-                    }\r
+                    auto_arrayptr<char> name(toUTF8(n->getName()));
+                    if (name.get() && *name.get()) {
+                        val.addmember("Name").string(name.get());
+                        char* str = toUTF8(n->getFormat());
+                        if (str && *str)
+                            val.addmember("Format").string(str);
+                        delete[] str;
+
+                        str = toUTF8(n->getNameQualifier());
+                        if (str && *str)
+                            val.addmember("NameQualifier").string(str);
+                        delete[] str;
+
+                        str = toUTF8(n->getSPNameQualifier());
+                        if (str && *str)
+                            val.addmember("SPNameQualifier").string(str);
+                        delete[] str;
+
+                        str = toUTF8(n->getSPProvidedID());
+                        if (str && *str)
+                            val.addmember("SPProvidedID").string(str);
+                        delete[] str;
+                    }
 
                     if (n != (*d)->getNameID())
                         delete n;