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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 21 21:04:45 2011
New Revision: 3551

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

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=3551&r1=3550&r2=3551&view=diff
==============================================================================
--- branches/REL_2/shibsp/SPConfig.cpp (original)
+++ branches/REL_2/shibsp/SPConfig.cpp Wed Dec 21 21:04:45 2011
@@ -197,12 +197,6 @@
     Category& log=Category::getInstance(SHIBSP_LOGCAT".Config");
     log.debug("%s library initialization started", PACKAGE_STRING);
 
-    if (!catalog_path)
-        catalog_path = getenv("SHIBSP_SCHEMAS");
-    if (!catalog_path)
-        catalog_path = SHIBSP_SCHEMAS;
-    XMLToolingConfig::getConfig().catalog_path = catalog_path;
-
 #ifndef SHIBSP_LITE
     XMLToolingConfig::getConfig().user_agent = string(PACKAGE_NAME) + '/' + PACKAGE_VERSION +
         " OpenSAML/" + gOpenSAMLDotVersionStr +
@@ -232,6 +226,14 @@
         return false;
     }
 #endif
+    if (!catalog_path)
+        catalog_path = getenv("SHIBSP_SCHEMAS");
+    if (!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);
     pr->setDefaultPrefix(inst_prefix2.c_str());