From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 25 Oct 2012 22:19:58 +0000 (-0700)
Subject: [2212] some minor cleanups: removed unnecessary return; wording/editorial fix
X-Git-Tag: trac2487_base~23^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8b60408e4843a88d15e3cd95dfeb898cea2a8fd;p=thirdparty%2Fkea.git

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

diff --git a/src/bin/auth/datasrc_clients_mgr.h b/src/bin/auth/datasrc_clients_mgr.h
index 9d8dfa2997..0628657a22 100644
--- a/src/bin/auth/datasrc_clients_mgr.h
+++ b/src/bin/auth/datasrc_clients_mgr.h
@@ -485,7 +485,7 @@ void
 DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone(
     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
     // minimal validation.
     assert(arg);
@@ -498,7 +498,6 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone(
     if (found == (*clients_map_)->end()) {
         isc_throw(InternalCommandError, "failed to load a zone " << origin <<
                   "/" << rrclass << ": not configured for the class");
-        return;
     }
 
     boost::shared_ptr<datasrc::ConfigurableClientList> client_list =
@@ -508,6 +507,7 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::doLoadZone(
     try {
         boost::shared_ptr<datasrc::memory::ZoneWriter> zwriter =
             getZoneWriter(*client_list, rrclass, origin);
+
         zwriter->load(); // this can take time but doesn't cause a race
         {   // install() can cause a race and must be in a critical section
             typename MutexType::Locker locker(*map_mutex_);