From ec32546ecbdae2c7e0352913e3d2b8a6e4f90e5d Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 24 Feb 2017 14:38:21 +0100 Subject: [PATCH] [master] Moved loadLibrarie() at the end --- src/bin/dhcp4/json_config_parser.cc | 10 +++++----- src/bin/dhcp6/json_config_parser.cc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc index 9f1f4dab90..46dfbd65df 100644 --- a/src/bin/dhcp4/json_config_parser.cc +++ b/src/bin/dhcp4/json_config_parser.cc @@ -628,15 +628,15 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set, // No need to commit interface names as this is handled by the // CfgMgr::commit() function. - // This occurs last as if it succeeds, there is no easy way - // revert it. As a result, the failure to commit a subsequent - // change causes problems when trying to roll back. - hooks_parser.loadLibraries(); - // Apply the staged D2ClientConfig, used to be done by parser commit D2ClientConfigPtr cfg; cfg = CfgMgr::instance().getStagingCfg()->getD2ClientConfig(); CfgMgr::instance().setD2ClientConfig(cfg); + + // This occurs last as if it succeeds, there is no easy way + // revert it. As a result, the failure to commit a subsequent + // change causes problems when trying to roll back. + hooks_parser.loadLibraries(); } catch (const isc::Exception& ex) { LOG_ERROR(dhcp4_logger, DHCP4_PARSER_COMMIT_FAIL).arg(ex.what()); diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc index 52740668a6..96b7460cca 100644 --- a/src/bin/dhcp6/json_config_parser.cc +++ b/src/bin/dhcp6/json_config_parser.cc @@ -851,15 +851,15 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set, // No need to commit interface names as this is handled by the // CfgMgr::commit() function. - // This occurs last as if it succeeds, there is no easy way to - // revert it. As a result, the failure to commit a subsequent - // change causes problems when trying to roll back. - hooks_parser.loadLibraries(); - // Apply staged D2ClientConfig, used to be done by parser commit D2ClientConfigPtr cfg; cfg = CfgMgr::instance().getStagingCfg()->getD2ClientConfig(); CfgMgr::instance().setD2ClientConfig(cfg); + + // This occurs last as if it succeeds, there is no easy way to + // revert it. As a result, the failure to commit a subsequent + // change causes problems when trying to roll back. + hooks_parser.loadLibraries(); } catch (const isc::Exception& ex) { LOG_ERROR(dhcp6_logger, DHCP6_PARSER_COMMIT_FAIL).arg(ex.what());