Remove extra path resolver call in catalog load.
authorscantor <scantor@de75baf8-a10c-0410-a50a-987c0e22f00f>
Wed, 12 Sep 2012 18:51:22 +0000 (18:51 +0000)
committerscantor <scantor@de75baf8-a10c-0410-a50a-987c0e22f00f>
Wed, 12 Sep 2012 18:51:22 +0000 (18:51 +0000)
git-svn-id: https://svn.shibboleth.net/cpp-xmltooling/branches/REL_1@995 de75baf8-a10c-0410-a50a-987c0e22f00f

xmltooling/util/ParserPool.cpp

index 1176617..78d64cc 100644 (file)
@@ -247,10 +247,8 @@ bool ParserPool::loadCatalogs(const char* pathnames)
     string temp(pathnames);
     vector<string> catpaths;
     split(catpaths, temp, is_any_of(PATH_SEPARATOR_STR), algorithm::token_compress_on);
-    for (vector<string>::iterator i = catpaths.begin(); i != catpaths.end(); ++i) {
-        XMLToolingConfig::getConfig().getPathResolver()->resolve(*i, PathResolver::XMLTOOLING_XML_FILE);
-        loadCatalog(i->c_str());
-    }
+    static bool (ParserPool::* lc)(const char*) = &ParserPool::loadCatalog;
+    for_each(catpaths.begin(), catpaths.end(), boost::bind(lc, this, boost::bind(&string::c_str, _1)));
     return !catpaths.empty();
 }