Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / saml / saml2 / binding / impl / SAML2SOAPClient.cpp

diff --git a/saml/saml2/binding/impl/SAML2SOAPClient.cpp b/saml/saml2/binding/impl/SAML2SOAPClient.cpp
index 2da5a0d..1435de1 100644 (file)
--- a/saml/saml2/binding/impl/SAML2SOAPClient.cpp
+++ b/saml/saml2/binding/impl/SAML2SOAPClient.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2009 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.
@@ -41,6 +41,16 @@ using namespace xmltooling::logging;
 using namespace xmltooling;
 using namespace std;
 
+SAML2SOAPClient::SAML2SOAPClient(opensaml::SOAPClient& soaper, bool fatalSAMLErrors)
+    : m_soaper(soaper), m_fatal(fatalSAMLErrors), m_correlate(nullptr)
+{
+}
+
+SAML2SOAPClient::~SAML2SOAPClient()
+{
+    XMLString::release(&m_correlate);
+}
+
 void SAML2SOAPClient::sendSAML(RequestAbstractType* request, const char* from, MetadataCredentialCriteria& to, const char* endpoint)
 {
     auto_ptr<Envelope> env(EnvelopeBuilder::buildEnvelope());
@@ -82,7 +92,7 @@ StatusResponseType* SAML2SOAPClient::receiveSAML()
                 // Check Status.
                 Status* status = response->getStatus();
                 if (status) {
-                    const XMLCh* code = status->getStatusCode() ? status->getStatusCode()->getValue() : NULL;
+                    const XMLCh* code = status->getStatusCode() ? status->getStatusCode()->getValue() : nullptr;
                     if (code && !XMLString::equals(code,StatusCode::SUCCESS) && handleError(*status)) {
                         BindingException ex("SAML response contained an error.");
                         annotateException(&ex, policy.getIssuerMetadata(), status);   // throws it
@@ -102,13 +112,13 @@ StatusResponseType* SAML2SOAPClient::receiveSAML()
         else
             ex.raise();
     }
-    return NULL;
+    return nullptr;
 }
 
 bool SAML2SOAPClient::handleError(const Status& status)
 {
-    auto_ptr_char code((status.getStatusCode() ? status.getStatusCode()->getValue() : NULL));
-    auto_ptr_char str((status.getStatusMessage() ? status.getStatusMessage()->getMessage() : NULL));
+    auto_ptr_char code((status.getStatusCode() ? status.getStatusCode()->getValue() : nullptr));
+    auto_ptr_char str((status.getStatusMessage() ? status.getStatusMessage()->getMessage() : nullptr));
     Category::getInstance(SAML_LOGCAT".SOAPClient").error(
         "SOAP client detected a SAML error: (%s) (%s)",
         (code.get() ? code.get() : "no code"),