projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c203f0
)
Remove extraneous config objects.
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 14 Sep 2010 03:23:07 +0000
(
03:23
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 14 Sep 2010 03:23:07 +0000
(
03:23
+0000)
shibsp/impl/XMLServiceProvider.cpp
patch
|
blob
|
history
diff --git
a/shibsp/impl/XMLServiceProvider.cpp
b/shibsp/impl/XMLServiceProvider.cpp
index
d623c10
..
30a3fa0
100644
(file)
--- 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
#ifndef SHIBSP_LITE
SAMLConfig& samlConf = SAMLConfig::getConfig();
#endif
- XMLToolingConfig& xmlConf = XMLToolingConfig::getConfig();
DOMElement* child;
#ifndef SHIBSP_LITE
if (conf.isEnabled(SPConfig::OutOfProcess)) {
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) {
// 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();
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);
XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();
const DOMElement* SHAR=XMLHelper::getFirstChildElement(e, OutOfProcess);
const DOMElement* SHIRE=XMLHelper::getFirstChildElement(e, InProcess);