projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e95cf4
)
Propagate out exceptions when loading extensions.
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 30 Sep 2008 20:45:09 +0000
(20:45 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 30 Sep 2008 20:45:09 +0000
(20:45 +0000)
xmltooling/XMLToolingConfig.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/XMLToolingConfig.cpp
b/xmltooling/XMLToolingConfig.cpp
index
ee9cc3c
..
59dd7ce
100644
(file)
--- a/
xmltooling/XMLToolingConfig.cpp
+++ b/
xmltooling/XMLToolingConfig.cpp
@@
-1,6
+1,6
@@
/*
* Copyright 2001-2007 Internet2
/*
* Copyright 2001-2007 Internet2
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@
-16,8
+16,8
@@
/**
* XMLToolingConfig.cpp
/**
* XMLToolingConfig.cpp
- *
- * Library configuration
+ *
+ * Library configuration
*/
#include "internal.h"
*/
#include "internal.h"
@@
-99,7
+99,7
@@
namespace xmltooling {
else
g_openssl_locks[n]->unlock();
}
else
g_openssl_locks[n]->unlock();
}
-
+
# ifndef WIN32
extern "C" unsigned long openssl_thread_id(void)
{
# ifndef WIN32
extern "C" unsigned long openssl_thread_id(void)
{
@@
-126,7
+126,7
@@
bool XMLToolingInternalConfig::log_config(const char* config)
config=getenv("XMLTOOLING_LOG_CONFIG");
if (!config || !*config)
config="WARN";
config=getenv("XMLTOOLING_LOG_CONFIG");
if (!config || !*config)
config="WARN";
-
+
bool level=false;
Category& root = Category::getRoot();
if (!strcmp(config,"DEBUG")) {
bool level=false;
Category& root = Category::getRoot();
if (!strcmp(config,"DEBUG")) {
@@
-177,7
+177,7
@@
bool XMLToolingInternalConfig::log_config(const char* config)
Category::getInstance(XMLTOOLING_LOGCAT".Logging").crit("failed to initialize log4cpp: %s", e.what());
return false;
}
Category::getInstance(XMLTOOLING_LOGCAT".Logging").crit("failed to initialize log4cpp: %s", e.what());
return false;
}
-
+
return true;
}
return true;
}
@@
-236,7
+236,7
@@
bool XMLToolingInternalConfig::init()
m_parserPool=new ParserPool();
m_validatingPool=new ParserPool(true,true);
m_lock=XMLPlatformUtils::makeMutex();
m_parserPool=new ParserPool();
m_validatingPool=new ParserPool(true,true);
m_lock=XMLPlatformUtils::makeMutex();
-
+
// Load catalogs from path.
if (!catalog_path.empty()) {
char* catpath=strdup(catalog_path.c_str());
// Load catalogs from path.
if (!catalog_path.empty()) {
char* catpath=strdup(catalog_path.c_str());
@@
-266,7
+266,7
@@
bool XMLToolingInternalConfig::init()
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(UnknownAttributeException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ValidationException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(IOException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(UnknownAttributeException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(ValidationException,xmltooling);
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(IOException,xmltooling);
-
+
#ifndef XMLTOOLING_NO_XMLSEC
XMLObjectBuilder::registerBuilder(QName(xmlconstants::XMLSIG_NS,Signature::LOCAL_NAME),new SignatureBuilder());
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(XMLSecurityException,xmltooling);
#ifndef XMLTOOLING_NO_XMLSEC
XMLObjectBuilder::registerBuilder(QName(xmlconstants::XMLSIG_NS,Signature::LOCAL_NAME),new SignatureBuilder());
REGISTER_XMLTOOLING_EXCEPTION_FACTORY(XMLSecurityException,xmltooling);
@@
-286,10
+286,10
@@
bool XMLToolingInternalConfig::init()
m_pathResolver = new PathResolver();
m_urlEncoder = new URLEncoder();
m_pathResolver = new PathResolver();
m_urlEncoder = new URLEncoder();
-
- // Register xml:id as an ID attribute.
+
+ // Register xml:id as an ID attribute.
static const XMLCh xmlid[] = UNICODE_LITERAL_2(i,d);
static const XMLCh xmlid[] = UNICODE_LITERAL_2(i,d);
- AttributeExtensibleXMLObject::registerIDAttribute(QName(xmlconstants::XML_NS, xmlid));
+ AttributeExtensibleXMLObject::registerIDAttribute(QName(xmlconstants::XML_NS, xmlid));
}
catch (const xercesc::XMLException&) {
log.fatal("caught exception while initializing Xerces");
}
catch (const xercesc::XMLException&) {
log.fatal("caught exception while initializing Xerces");
@@
-344,7
+344,7
@@
void XMLToolingInternalConfig::term()
delete m_pathResolver;
m_pathResolver = NULL;
delete m_pathResolver;
m_pathResolver = NULL;
-
+
delete m_templateEngine;
m_templateEngine = NULL;
delete m_templateEngine;
m_templateEngine = NULL;
@@
-367,7
+367,7
@@
void XMLToolingInternalConfig::term()
#endif
}
m_libhandles.clear();
#endif
}
m_libhandles.clear();
-
+
delete m_parserPool;
m_parserPool=NULL;
delete m_validatingPool;
delete m_parserPool;
m_parserPool=NULL;
delete m_validatingPool;
@@
-385,7
+385,7
@@
void XMLToolingInternalConfig::term()
#ifndef XMLTOOLING_NO_XMLSEC
curl_global_cleanup();
#ifndef XMLTOOLING_NO_XMLSEC
curl_global_cleanup();
-#endif
+#endif
#ifdef _DEBUG
xmltooling::NDC ndc("term");
#endif
#ifdef _DEBUG
xmltooling::NDC ndc("term");
#endif
@@
-415,13
+415,13
@@
bool XMLToolingInternalConfig::load_library(const char* path, void* context)
string resolved(path);
m_pathResolver->resolve(resolved, PathResolver::XMLTOOLING_LIB_FILE);
string resolved(path);
m_pathResolver->resolve(resolved, PathResolver::XMLTOOLING_LIB_FILE);
-
+
#if defined(WIN32)
HMODULE handle=NULL;
for (string::iterator i = resolved.begin(); i != resolved.end(); ++i)
if (*i == '/')
*i = '\\';
#if defined(WIN32)
HMODULE handle=NULL;
for (string::iterator i = resolved.begin(); i != resolved.end(); ++i)
if (*i == '/')
*i = '\\';
-
+
UINT em=SetErrorMode(SEM_FAILCRITICALERRORS);
try {
handle=LoadLibraryEx(resolved.c_str(),NULL,LOAD_WITH_ALTERED_SEARCH_PATH);
UINT em=SetErrorMode(SEM_FAILCRITICALERRORS);
try {
handle=LoadLibraryEx(resolved.c_str(),NULL,LOAD_WITH_ALTERED_SEARCH_PATH);
@@
-436,12
+436,11
@@
bool XMLToolingInternalConfig::load_library(const char* path, void* context)
throw runtime_error(string("detected error in xmltooling_extension_init: ") + resolved);
SetErrorMode(em);
}
throw runtime_error(string("detected error in xmltooling_extension_init: ") + resolved);
SetErrorMode(em);
}
- catch(runtime_error& e) {
- log.error(e.what());
+ catch(exception&) {
if (handle)
FreeLibrary(handle);
SetErrorMode(em);
if (handle)
FreeLibrary(handle);
SetErrorMode(em);
-
return false
;
+
throw
;
}
#elif defined(HAVE_DLFCN_H)
}
#elif defined(HAVE_DLFCN_H)
@@
-460,11
+459,10
@@
bool XMLToolingInternalConfig::load_library(const char* path, void* context)
if (fn(context)!=0)
throw runtime_error(string("detected error in xmltooling_extension_init in ") + resolved);
}
if (fn(context)!=0)
throw runtime_error(string("detected error in xmltooling_extension_init in ") + resolved);
}
- catch(runtime_error& e) {
- log.error(e.what());
+ catch(exception&) {
if (handle)
dlclose(handle);
if (handle)
dlclose(handle);
-
return false
;
+
throw
;
}
#else
# error "Don't know about dynamic loading on this platform!"
}
#else
# error "Don't know about dynamic loading on this platform!"