From 9b30bb6cbd0c33e62293127929b5941d4f18f8f7 Mon Sep 17 00:00:00 2001 From: scantor Date: Thu, 24 May 2012 21:38:08 +0000 Subject: [PATCH] Use default operator of AND git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3678 cb58f699-b61c-0410-a6fe-9272a202ed29 --- shibsp/impl/ChainingAccessControl.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/shibsp/impl/ChainingAccessControl.cpp b/shibsp/impl/ChainingAccessControl.cpp index 82dc94b..7681e03 100644 --- a/shibsp/impl/ChainingAccessControl.cpp +++ b/shibsp/impl/ChainingAccessControl.cpp @@ -95,14 +95,12 @@ AccessControl::~AccessControl() { } -ChainingAccessControl::ChainingAccessControl(const DOMElement* e) +ChainingAccessControl::ChainingAccessControl(const DOMElement* e) : m_op(OP_AND) { const XMLCh* op = e ? e->getAttributeNS(nullptr, _operator) : nullptr; - if (XMLString::equals(op, AND)) - m_op = OP_AND; - else if (XMLString::equals(op, OR)) + if (XMLString::equals(op, OR)) m_op = OP_OR; - else + else if (op && *op && !XMLString::equals(op, AND)) throw ConfigurationException("Missing or unrecognized operator in Chaining AccessControl configuration."); e = XMLHelper::getFirstChildElement(e, _AccessControl); -- 2.1.4