Convert logging to log4shib via compile time switch.

[shibboleth/cpp-opensaml.git] / saml / saml1 / binding / impl / SAML1SOAPDecoder.cpp

diff --git a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
index eff4034..47f2c60 100644 (file)
--- a/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
+++ b/saml/saml1/binding/impl/SAML1SOAPDecoder.cpp
@@ -25,7 +25,7 @@
 #include "binding/MessageDecoder.h"
 #include "saml1/core/Protocols.h"
 
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
 #include <xmltooling/soap/SOAP.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/validation/ValidatorSuite.h>
@@ -33,8 +33,8 @@
 using namespace opensaml::saml1p;
 using namespace opensaml;
 using namespace soap11;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
@@ -42,7 +42,7 @@ namespace opensaml {
         class SAML_DLLLOCAL SAML1SOAPDecoder : public MessageDecoder
         {
         public:
-            SAML1SOAPDecoder(const DOMElement* e) {}
+            SAML1SOAPDecoder() {}
             virtual ~SAML1SOAPDecoder() {}
 
             bool isUserAgentPresent() const {
@@ -56,9 +56,9 @@ namespace opensaml {
                 ) const;
         };                
 
-        MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const DOMElement* const & e)
+        MessageDecoder* SAML_DLLLOCAL SAML1SOAPDecoderFactory(const pair<const DOMElement*,const XMLCh*>& p)
         {
-            return new SAML1SOAPDecoder(e);
+            return new SAML1SOAPDecoder();
         }
     };
 };
@@ -78,14 +78,12 @@ XMLObject* SAML1SOAPDecoder::decode(
     string s = genericRequest.getContentType();
     if (s.find("text/xml") == string::npos) {
         log.warn("ignoring incorrect content type (%s)", s.c_str() ? s.c_str() : "none");
-        return NULL;
+        throw BindingException("Invalid content type for SOAP message.");
     }
 
     const char* data = genericRequest.getRequestBody();
-    if (!data) {
-        log.warn("empty request body");
-        return NULL;
-    }
+    if (!data)
+        throw BindingException("SOAP message had an empty request body.");
     istringstream is(data);
     
     // Parse and bind the document into an XMLObject.