Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / security / impl / ChainingCredentialResolver.cpp

diff --git a/xmltooling/security/impl/ChainingCredentialResolver.cpp b/xmltooling/security/impl/ChainingCredentialResolver.cpp
index e0e198e..eefbc29 100644 (file)
--- a/xmltooling/security/impl/ChainingCredentialResolver.cpp
+++ b/xmltooling/security/impl/ChainingCredentialResolver.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,18 +21,21 @@
  */
 
 #include "internal.h"
+#include "logging.h"
 #include "XMLToolingConfig.h"
 #include "security/CredentialResolver.h"
 #include "util/NDC.h"
 #include "util/XMLHelper.h"
 
-#include <log4cpp/Category.hh>
+#include <algorithm>
 #include <xercesc/util/XMLUniDefs.hpp>
 
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
+using xercesc::DOMElement;
+
 namespace xmltooling {
     class XMLTOOL_DLLLOCAL ChainingCredentialResolver : public CredentialResolver
     {
@@ -43,22 +46,22 @@ namespace xmltooling {
         }
 
         Lockable* lock() {
-            for_each(m_resolvers.begin(), m_resolvers.end(), mem_fun(&CredentialResolver::lock));
+            for_each(m_resolvers.begin(), m_resolvers.end(), mem_fun(&Lockable::lock));
             return this;
         }
         void unlock() {
-            for_each(m_resolvers.begin(), m_resolvers.end(), mem_fun(&CredentialResolver::unlock));
+            for_each(m_resolvers.begin(), m_resolvers.end(), mem_fun(&Lockable::unlock));
         }
         
-        const Credential* resolve(const CredentialCriteria* criteria=NULL) const {
-            const Credential* cred = NULL;
+        const Credential* resolve(const CredentialCriteria* criteria=nullptr) const {
+            const Credential* cred = nullptr;
             for (vector<CredentialResolver*>::const_iterator cr = m_resolvers.begin(); !cred && cr!=m_resolvers.end(); ++cr)
                 cred = (*cr)->resolve(criteria);
             return cred;
         }
 
         virtual vector<const Credential*>::size_type resolve(
-            vector<const Credential*>& results, const CredentialCriteria* criteria=NULL
+            vector<const Credential*>& results, const CredentialCriteria* criteria=nullptr
             ) const {
             for (vector<CredentialResolver*>::const_iterator cr = m_resolvers.begin(); cr!=m_resolvers.end(); ++cr)
                 (*cr)->resolve(results, criteria);
@@ -80,24 +83,20 @@ namespace xmltooling {
 
 ChainingCredentialResolver::ChainingCredentialResolver(const DOMElement* e)
 {
-#ifdef _DEBUG
-    NDC ndc("ChainingCredentialResolver");
-#endif
-
     XMLToolingConfig& conf = XMLToolingConfig::getConfig();
+    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver."CHAINING_CREDENTIAL_RESOLVER);
 
     // Load up the chain of resolvers.
-    e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : NULL;
+    e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : nullptr;
     while (e) {
-        auto_ptr_char type(e->getAttributeNS(NULL,_type));
+        auto_ptr_char type(e->getAttributeNS(nullptr,_type));
         if (type.get() && *(type.get())) {
+            log.info("building CredentialResolver of type %s", type.get());
             try {
                 m_resolvers.push_back(conf.CredentialResolverManager.newPlugin(type.get(),e));
             }
             catch (exception& ex) {
-                Category::getInstance(XMLTOOLING_LOGCAT".CredentialResolver").error(
-                    "caught exception processing embedded CredentialResolver element: %s", ex.what()
-                    );
+                log.error("caught exception processing embedded CredentialResolver element: %s", ex.what());
             }
         }
         e = XMLHelper::getNextSiblingElement(e, _CredentialResolver);