[#2672] Changed to call setAppendedParameters once

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index f94458b43683297fcc98666ff9e170d69fe87523..75256ced879f488ab59e0f067f7a58288e937bda 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -917,10 +917,11 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) {
             std::bind(&ControlledDhcpv4Srv::dbFailedCallback, srv, ph::_1);
 
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
-        cfg_db->setAppendedParameters("universe=4");
+        string params = "universe=4";
         if (cfg_db->getExtendedInfoTablesEnabled()) {
-            cfg_db->setAppendedParameters("extended-info-tables=true");
+            params += " extended-info-tables=true";
         }
+        cfg_db->setAppendedParameters(params);
         cfg_db->createManagers();
         // Reset counters related to connections as all managers have been recreated.
         srv->getNetworkState()->reset(NetworkState::Origin::DB_CONNECTION);

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 59397692d304c6cbee3e0afe7ac30ad5d206546a..67cf64d62e238238269c733c5779adcd4e7d9b6a 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -921,10 +921,11 @@ ControlledDhcpv6Srv::processConfig(isc::data::ConstElementPtr config) {
             std::bind(&ControlledDhcpv6Srv::dbFailedCallback, srv, ph::_1);
 
         CfgDbAccessPtr cfg_db = CfgMgr::instance().getStagingCfg()->getCfgDbAccess();
-        cfg_db->setAppendedParameters("universe=6");
+        string params = "universe=6";
         if (cfg_db->getExtendedInfoTablesEnabled()) {
-            cfg_db->setAppendedParameters("extended-info-tables=true");
+            params += " extended-info-tables=true";
         }
+        cfg_db->setAppendedParameters(params);
         cfg_db->createManagers();
         // Reset counters related to connections as all managers have been recreated.
         srv->getNetworkState()->reset(NetworkState::Origin::DB_CONNECTION);