[cpp-sp COMMIT] /branches/REL_2/shibsp/SPConfig.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 21 14:08:36 2013
New Revision: 3880

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

Modified:
    branches/REL_2/shibsp/SPConfig.cpp

Modified: branches/REL_2/shibsp/SPConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/SPConfig.cpp?rev=3880&r1=3879&r2=3880&view=diff
==============================================================================
--- branches/REL_2/shibsp/SPConfig.cpp (original)
+++ branches/REL_2/shibsp/SPConfig.cpp Thu Nov 21 14:08:36 2013
@@ -233,13 +233,6 @@
         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);
@@ -265,6 +258,14 @@
     if (!inst_prefix || !*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");