[cpp-sp COMMIT] in /branches/REL_2/shibsp/handler/impl: SAML2LogoutInitiator.cpp SAML2SessionInitiator.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 28 19:38:06 2015
New Revision: 3901

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3901&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-630

Modified:
    branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp

Modified: branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp?rev=3901&r1=3900&r2=3901&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp Wed Jan 28 19:38:06 2015
@@ -335,7 +335,8 @@
         const MessageEncoder* encoder = nullptr;
         for (vector<string>::const_iterator b = m_bindings.begin(); b != m_bindings.end(); ++b) {
             auto_ptr_XMLCh wideb(b->c_str());
-            if (ep = EndpointManager<SingleLogoutService>(role->getSingleLogoutServices()).getByBinding(wideb.get())) {
+            ep = EndpointManager<SingleLogoutService>(role->getSingleLogoutServices()).getByBinding(wideb.get());
+            if (ep) {
                 map< string,boost::shared_ptr<MessageEncoder> >::const_iterator enc = m_encoders.find(*b);
                 if (enc != m_encoders.end())
                     encoder = enc->second.get();

Modified: branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp?rev=3901&r1=3900&r2=3901&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp Wed Jan 28 19:38:06 2015
@@ -600,10 +600,12 @@
         role = dynamic_cast<const IDPSSODescriptor*>(entity.second);
         for (vector<string>::const_iterator b = m_bindings.begin(); b != m_bindings.end(); ++b) {
             auto_ptr_XMLCh wideb(b->c_str());
-            if (ep=EndpointManager<SingleSignOnService>(role->getSingleSignOnServices()).getByBinding(wideb.get())) {
+            ep = EndpointManager<SingleSignOnService>(role->getSingleSignOnServices()).getByBinding(wideb.get());
+            if (ep) {
                 map< string,boost::shared_ptr<MessageEncoder> >::const_iterator enc = m_encoders.find(*b);
-                if (enc != m_encoders.end())
+                if (enc != m_encoders.end()) {
                     encoder = enc->second.get();
+                }
                 break;
             }
         }