From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 14 Sep 2010 03:23:07 +0000 (+0000)
Subject: Remove extraneous config objects.
X-Git-Tag: 2.4RC1~45
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=73affb75a2004df086f260d3c08419ef66cb9bf9;hp=6c203f0805f00da8c6781704350aa2f25d1e6662;p=shibboleth%2Fcpp-sp.git

Remove extraneous config objects.
---

diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index d623c10..30a3fa0 100644
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -1732,11 +1732,11 @@ void XMLConfigImpl::doCaching(const DOMElement* e, Category& log)
 #ifndef SHIBSP_LITE
     SAMLConfig& samlConf = SAMLConfig::getConfig();
 #endif
-    XMLToolingConfig& xmlConf = XMLToolingConfig::getConfig();
 
     DOMElement* child;
 #ifndef SHIBSP_LITE
     if (conf.isEnabled(SPConfig::OutOfProcess)) {
+        XMLToolingConfig& xmlConf = XMLToolingConfig::getConfig();
         // First build any StorageServices.
         child = XMLHelper::getFirstChildElement(e, _StorageService);
         while (child) {
@@ -1838,9 +1838,6 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o
 
     try {
         SPConfig& conf=SPConfig::getConfig();
-#ifndef SHIBSP_LITE
-        SAMLConfig& samlConf=SAMLConfig::getConfig();
-#endif
         XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();
         const DOMElement* SHAR=XMLHelper::getFirstChildElement(e, OutOfProcess);
         const DOMElement* SHIRE=XMLHelper::getFirstChildElement(e, InProcess);