From: Scott Cantor Date: Fri, 8 Aug 2008 20:25:02 +0000 (+0000) Subject: Change exception class when config fails. X-Git-Tag: 2.1.0~2 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=5869456f3933bbd4b94ca7b8888d36eda3ee6882 Change exception class when config fails. --- diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp index d44ec98..312486f 100644 --- a/apache/mod_apache.cpp +++ b/apache/mod_apache.cpp @@ -1274,7 +1274,7 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s) try { if (!g_Config->instantiate(g_szSHIBConfig, true)) - throw exception("unknown error"); + throw runtime_error("unknown error"); } catch (exception& ex) { ap_log_error(APLOG_MARK,APLOG_CRIT|APLOG_NOERRNO,SH_AP_R(s),ex.what()); diff --git a/fastcgi/shibauthorizer.cpp b/fastcgi/shibauthorizer.cpp index 00e6607..282dad9 100644 --- a/fastcgi/shibauthorizer.cpp +++ b/fastcgi/shibauthorizer.cpp @@ -268,7 +268,7 @@ int main(void) try { if (!g_Config->instantiate(NULL, true)) - throw exception("unknown error"); + throw runtime_error("unknown error"); } catch (exception& ex) { g_Config->term(); diff --git a/fastcgi/shibresponder.cpp b/fastcgi/shibresponder.cpp index 5df6dcd..3582833 100644 --- a/fastcgi/shibresponder.cpp +++ b/fastcgi/shibresponder.cpp @@ -285,7 +285,7 @@ int main(void) try { if (!g_Config->instantiate(NULL, true)) - throw exception("unknown error"); + throw runtime_error("unknown error"); } catch (exception& ex) { g_Config->term(); diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp index 8f04cb3..71cb033 100644 --- a/isapi_shib/isapi_shib.cpp +++ b/isapi_shib/isapi_shib.cpp @@ -172,7 +172,7 @@ extern "C" BOOL WINAPI GetFilterVersion(PHTTP_FILTER_VERSION pVer) try { if (!g_Config->instantiate(NULL, true)) - throw exception("unknown error"); + throw runtime_error("unknown error"); } catch (exception& ex) { g_Config->term(); diff --git a/nsapi_shib/nsapi_shib.cpp b/nsapi_shib/nsapi_shib.cpp index 069591a..339ebc0 100644 --- a/nsapi_shib/nsapi_shib.cpp +++ b/nsapi_shib/nsapi_shib.cpp @@ -142,7 +142,7 @@ extern "C" NSAPI_PUBLIC int nsapi_shib_init(pblock* pb, ::Session* sn, Request* try { if (!g_Config->instantiate(pblock_findval("shib-config",pb), true)) - throw exception("unknown error"); + throw runtime_error("unknown error"); } catch (exception& ex) { pblock_nvinsert("error",ex.what(),pb);