[cpp-sp] 01/02: Regression, tran log has to be maintained with one-time objects.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=e11549b6c45c43fcd4a007dc23089a8064391087

commit e11549b6c45c43fcd4a007dc23089a8064391087
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 20 17:32:55 2018 -0400

    Regression, tran log has to be maintained with one-time objects.
---
 shibsp/impl/XMLServiceProvider.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index 46a70a5..d087a37 100644
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -303,7 +303,6 @@ namespace {
         }
 
 #ifndef SHIBSP_LITE
-        scoped_ptr<TransactionLog> m_tranLog;
         scoped_ptr<SecurityPolicyProvider> m_policy;
         vector< boost::tuple<string,string,string> > m_transportOptions;
 #endif
@@ -381,8 +380,8 @@ namespace {
         void receive(DDF& in, ostream& out);
 
         TransactionLog* getTransactionLog() const {
-            if (m_impl->m_tranLog)
-                return m_impl->m_tranLog.get();
+            if (m_tranLog)
+                return m_tranLog.get();
             throw ConfigurationException("No TransactionLog available.");
         }
 
@@ -451,6 +450,7 @@ namespace {
         // Storage is the lowest, then remoting, then the cache, and finally the rest.
 #ifndef SHIBSP_LITE
         map< string,boost::shared_ptr<StorageService> > m_storage;
+        scoped_ptr<TransactionLog> m_tranLog;
 #endif
         scoped_ptr<ListenerService> m_listener;
         scoped_ptr<SessionCache> m_sessionCache;
@@ -2072,7 +2072,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, XMLConfig* outer,
         }
 
 #ifndef SHIBSP_LITE
-        m_tranLog.reset(
+        outer->m_tranLog.reset(
             new TransactionLog(
                 XMLHelper::getAttrString(SHAR, nullptr, tranLogFormat).c_str(),
                 XMLHelper::getAttrString(SHAR, nullptr, tranLogFiller).c_str()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.