Commit 35b589ad authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[1543] Have catch on the same line as }

As it is tightly coupled with the previous try statement.
parent 32f93f71
......@@ -64,8 +64,7 @@ parseAddresses(isc::data::ConstElementPtr addresses,
}
result.push_back(AddressPair(addr->stringValue(),
port->intValue()));
}
catch (const TypeError&) { // Better error message
} catch (const TypeError&) { // Better error message
LOG_ERROR(logger, SRVCOMM_ADDRESS_TYPE).
arg(addrPair->str());
isc_throw(TypeError,
......@@ -135,8 +134,7 @@ installListenAddresses(const AddressList& newAddresses,
}
setAddresses(service, newAddresses);
addressStore = newAddresses;
}
catch (const SocketRequestor::NonFatalSocketError& e) {
} catch (const SocketRequestor::NonFatalSocketError& e) {
/*
* If one of the addresses isn't set successfully, we will restore
* the old addresses, the behavior is that either all address are
......@@ -164,15 +162,13 @@ installListenAddresses(const AddressList& newAddresses,
//Anyway the new configure has problem, we need to notify configure
//manager the new configure doesn't work
throw;
}
catch (const exception& e) {
} catch (const exception& e) {
// Any other kind of exception is fatal. It might mean we are in
// inconsistent state with the boss/socket creator, so we abort
// to make sure it doesn't last.
LOG_FATAL(logger, SRVCOMM_EXCEPTION_ALLOC).arg(e.what());
abort();
}
catch (...) {
} catch (...) {
// As the previous one, but we know even less info
LOG_FATAL(logger, SRVCOMM_UNKNOWN_EXCEPTION_ALLOC);
abort();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment