Commit d8b60408 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2212] some minor cleanups: removed unnecessary return; wording/editorial fix

parent 99bdc7de
...@@ -485,7 +485,7 @@ void ...@@ -485,7 +485,7 @@ void
DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone( DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone(
const isc::data::ConstElementPtr& arg) const isc::data::ConstElementPtr& arg)
{ {
// We assume same basic level validation as this method can only be // We assume some basic level validation as this method can only be
// called via the manager in practice. manager is expected to do the // called via the manager in practice. manager is expected to do the
// minimal validation. // minimal validation.
assert(arg); assert(arg);
...@@ -498,7 +498,6 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone( ...@@ -498,7 +498,6 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone(
if (found == (*clients_map_)->end()) { if (found == (*clients_map_)->end()) {
isc_throw(InternalCommandError, "failed to load a zone " << origin << isc_throw(InternalCommandError, "failed to load a zone " << origin <<
"/" << rrclass << ": not configured for the class"); "/" << rrclass << ": not configured for the class");
return;
} }
boost::shared_ptr<datasrc::ConfigurableClientList> client_list = boost::shared_ptr<datasrc::ConfigurableClientList> client_list =
...@@ -508,6 +507,7 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone( ...@@ -508,6 +507,7 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone(
try { try {
boost::shared_ptr<datasrc::memory::ZoneWriter> zwriter = boost::shared_ptr<datasrc::memory::ZoneWriter> zwriter =
getZoneWriter(*client_list, rrclass, origin); getZoneWriter(*client_list, rrclass, origin);
zwriter->load(); // this can take time but doesn't cause a race zwriter->load(); // this can take time but doesn't cause a race
{ // install() can cause a race and must be in a critical section { // install() can cause a race and must be in a critical section
typename MutexType::Locker locker(*map_mutex_); typename MutexType::Locker locker(*map_mutex_);
......
Markdown is supported
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