From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 26 Aug 2021 10:37:40 +0000 (-0400)
Subject: [#2051] Addressed review comments
X-Git-Tag: Kea-1.9.11~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ae729dd90feff47d1160545a9d64cc555d75789;p=thirdparty%2Fkea.git

[#2051] Addressed review comments

    Minor clean-ups only.
---

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index 4191278256..f4e8935587 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -732,10 +732,10 @@ LeaseCmdsImpl::leaseAddHandler(CalloutHandle& handle) {
         if (v4) {
             Lease4Parser parser;
             lease4 = parser.parse(config, cmd_args_, force_create);
-
             if (lease4) {
                 bool success;
                 if (!MultiThreadingMgr::instance().getMode()) {
+                    // Not multi-threading.
                     success = LeaseMgrFactory::instance().addLease(lease4);
                 } else {
                     // Multi-threading, try to lock first to avoid a race.
@@ -1838,7 +1838,7 @@ LeaseCmdsImpl::lease6UpdateHandler(CalloutHandle& handle) {
         // The parser does sanity checks (if the address is in scope, if
         // subnet-id is valid, etc)
         lease6 = parser.parse(config, cmd_args_, force_create);
-        bool added;
+        bool added = false;
         if (!MultiThreadingMgr::instance().getMode()) {
             // Not multi-threading.
             added = addOrUpdate6(lease6, force_create);
diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
index 01f5a66799..1fc19f2772 100644
--- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
+++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
@@ -8927,7 +8927,7 @@ TEST_F(LeaseCmdsTest, testLease6BulkApplyAddConflict) {
     EXPECT_TRUE(lmptr_->getLease6(Lease::TYPE_NA, IOAddress("2001:db8:1::123")));
     EXPECT_TRUE(lmptr_->getLease6(Lease::TYPE_NA, IOAddress("2001:db8:1::124")));
 
-    // Check that the lease for 2001:db8:2::123 was not added.
+    // Check that the lease for locked address was not added.
     EXPECT_FALSE(lmptr_->getLease6(Lease::TYPE_NA, locked_addr));
 
     auto args = rsp->get("arguments");