Commit c48f99bb authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Merged trac5186 (config-test vs unregister timers)

parents 4235b056 a62c6263
......@@ -413,7 +413,9 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set,
Subnet::resetSubnetID();
// Remove any existing timers.
TimerMgr::instance()->unregisterTimers();
if (!check_only) {
TimerMgr::instance()->unregisterTimers();
}
// Revert any runtime option definitions configured so far and not committed.
LibDHCP::revertRuntimeOptionDefs();
......
......@@ -608,7 +608,9 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set,
Subnet::resetSubnetID();
// Remove any existing timers.
TimerMgr::instance()->unregisterTimers();
if (!check_only) {
TimerMgr::instance()->unregisterTimers();
}
// Revert any runtime option definitions configured so far and not committed.
LibDHCP::revertRuntimeOptionDefs();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment