summaryrefslogtreecommitdiffstats
path: root/src/Core
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2008-09-19 11:15:14 +0200
committerMatthias Schiffer <matthias@gamezock.de>2008-09-19 11:15:14 +0200
commit113b1f4bbdecfab24ed9781b730a76a442adad6f (patch)
treee28f5c9a7a1afebd7d920f1006aacff401894dbc /src/Core
parent793a0789858734141dfa12d2ab3dd6ea3ed293e8 (diff)
downloadmad-113b1f4bbdecfab24ed9781b730a76a442adad6f.tar
mad-113b1f4bbdecfab24ed9781b730a76a442adad6f.zip
Exceptions vereinheitlicht
Diffstat (limited to 'src/Core')
-rw-r--r--src/Core/ConfigManager.cpp2
-rw-r--r--src/Core/ConnectionManager.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Core/ConfigManager.cpp b/src/Core/ConfigManager.cpp
index 4484420..9361493 100644
--- a/src/Core/ConfigManager.cpp
+++ b/src/Core/ConfigManager.cpp
@@ -38,7 +38,7 @@ bool ConfigManager::parseLine(const std::vector<std::string> &section, const std
try {
listeners.push_back(Net::IPAddress(value));
}
- catch(Net::InvalidAddressException &e) {
+ catch(Common::Exception &e) {
// TODO Logging
}
}
diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index 546d097..ceefe18 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -81,7 +81,7 @@ ConnectionManager::ConnectionManager() {
try {
listeners.push_back(new Net::Listener(configManager->getX509CertFile(), configManager->getX509KeyFile()));
}
- catch(Net::Exception &e) {
+ catch(Common::Exception &e) {
// TODO Log error
}
}
@@ -90,7 +90,7 @@ ConnectionManager::ConnectionManager() {
try {
listeners.push_back(new Net::Listener(configManager->getX509CertFile(), configManager->getX509KeyFile(), *address));
}
- catch(Net::Exception &e) {
+ catch(Common::Exception &e) {
// TODO Log error
}
}
@@ -169,7 +169,7 @@ Net::Connection* ConnectionManager::getDaemonConnection(const std::string &name)
throw Common::Exception(Common::Exception::UNKNOWN_DAEMON);
if(!daemon->second)
- throw Common::Exception(Common::Exception::DAEMON_INACTIVE);
+ throw Common::Exception(Common::Exception::NOT_AVAILABLE);
return daemon->second;
}