[cpp-xmltooling COMMIT] /branches/REL_1/xmltooling/util/ParserPool.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 12 14:51:22 2012
New Revision: 995

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=995&view=rev
Log:
Remove extra path resolver call in catalog load.

Modified:
    branches/REL_1/xmltooling/util/ParserPool.cpp

Modified: branches/REL_1/xmltooling/util/ParserPool.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/ParserPool.cpp?rev=995&r1=994&r2=995&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/ParserPool.cpp (original)
+++ branches/REL_1/xmltooling/util/ParserPool.cpp Wed Sep 12 14:51:22 2012
@@ -247,10 +247,8 @@
     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();
 }