From 5e2391930ca23e896d6cf0a78e3c66dd732f27c4 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Thu, 21 Nov 2013 19:08:36 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/SSPCPP-589 --- shibsp/SPConfig.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp index 0e42344..695763a 100644 --- a/shibsp/SPConfig.cpp +++ b/shibsp/SPConfig.cpp @@ -233,13 +233,6 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix) return false; } #endif - if (!catalog_path) - catalog_path = getenv("SHIBSP_SCHEMAS"); - if (!catalog_path || !*catalog_path) - catalog_path = SHIBSP_SCHEMAS; - if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) { - log.warn("failed to load schema catalogs into validating parser"); - } PathResolver* pr = XMLToolingConfig::getConfig().getPathResolver(); pr->setDefaultPackageName(PACKAGE_NAME); @@ -266,6 +259,14 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix) inst_prefix = SHIBSP_XMLDIR; pr->setXMLDir(inst_prefix); + if (!catalog_path) + catalog_path = getenv("SHIBSP_SCHEMAS"); + if (!catalog_path || !*catalog_path) + catalog_path = SHIBSP_SCHEMAS; + if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) { + log.warn("failed to load schema catalogs into validating parser"); + } + XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine()); XMLToolingConfig::getConfig().getTemplateEngine()->setTagPrefix("shibmlp"); -- 2.1.4