BIND 10 trac2211, updated. 9ba0013f74bf3ed03d95add7c1d46c2d28a94492 [2211] adjusted log severity from ERROR to FATAL before aborting.

[BIND 10 source code commits]

The branch, trac2211 has been updated
       via  9ba0013f74bf3ed03d95add7c1d46c2d28a94492 (commit)
       via  d709ef90b8f23a6c41a05d2f5a62cb91840fde0d (commit)
      from  246a87a4a681a574a0ecff9b26a49e471a60138a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9ba0013f74bf3ed03d95add7c1d46c2d28a94492
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Oct 23 10:20:21 2012 -0700

    [2211] adjusted log severity from ERROR to FATAL before aborting.

commit d709ef90b8f23a6c41a05d2f5a62cb91840fde0d
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Oct 23 10:18:33 2012 -0700

    [2211] removed an extra block from sendCommand() with clarification comments

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/datasrc_clients_mgr.h |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/datasrc_clients_mgr.h b/src/bin/auth/datasrc_clients_mgr.h
index 4d66006..c23f384 100644
--- a/src/bin/auth/datasrc_clients_mgr.h
+++ b/src/bin/auth/datasrc_clients_mgr.h
@@ -242,11 +242,12 @@ private:
     void sendCommand(datasrc_clientmgr_internal::CommandID command,
                      data::ConstElementPtr arg)
     {
-        {
-            typename MutexType::Locker locker(queue_mutex_);
-            command_queue_.push_back(
-                datasrc_clientmgr_internal::Command(command, arg));
-        }
+        // The lock will be held until the end of this method.  Only
+        // push_back has to be protected, but we can avoid having an extra
+        // block this way.
+        typename MutexType::Locker locker(queue_mutex_);
+        command_queue_.push_back(
+            datasrc_clientmgr_internal::Command(command, arg));
         cond_.signal();
     }
 
@@ -382,11 +383,11 @@ DataSrcClientsBuilderBase<MutexType, CondVarType>::run() {
         LOG_INFO(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_STOPPED);
     } catch (const std::exception& ex) {
         // We explicitly catch exceptions so we can log it as soon as possible.
-        LOG_ERROR(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_FAILED).
+        LOG_FATAL(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_FAILED).
             arg(ex.what());
         assert(false);
     } catch (...) {
-        LOG_ERROR(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_FAILED_UNEXPECTED);
+        LOG_FATAL(auth_logger, AUTH_DATASRC_CLIENTS_BUILDER_FAILED_UNEXPECTED);
         assert(false);
     }
 }