From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 4 Jan 2012 23:41:12 +0000 (-0800)
Subject: [805] a few minor cleanups: typo; position of catch; eliminating an unnecessary
X-Git-Tag: trac2351_base~304^2~16^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c836c770e7109302fa1a27d51ae2fec573c03cb5;p=thirdparty%2Fkea.git

[805] a few minor cleanups: typo; position of catch; eliminating an unnecessary
temporary variable.
---

diff --git a/src/lib/server_common/portconfig.cc b/src/lib/server_common/portconfig.cc
index 2b6e4ecd86..6ee1ae4caa 100644
--- a/src/lib/server_common/portconfig.cc
+++ b/src/lib/server_common/portconfig.cc
@@ -153,14 +153,12 @@ installListenAddresses(const AddressList& newAddresses,
         LOG_ERROR(logger, SRVCOMM_ADDRESS_FAIL).arg(e.what());
         try {
             setAddresses(service, addressStore);
-        }
-        catch (const exception& e2) {
+        } catch (const exception& e2) {
             LOG_FATAL(logger, SRVCOMM_ADDRESS_UNRECOVERABLE).arg(e2.what());
-            // If we can't set the new ones, nor the old ones, at last
+            // If we can't set the new ones, nor the old ones, at least
             // releasing everything should work. If it doesn't, there isn't
             // anything else we could do.
-            AddressList empty;
-            setAddresses(service, empty);
+            setAddresses(service, AddressList());
             addressStore.clear();
         }
         //Anyway the new configure has problem, we need to notify configure