From a45648214245c8be0db4764148ba59f9ccb0f91d Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 27 Jan 2017 20:09:12 +0100 Subject: [PATCH] [5123] Foctorized calls to get --- src/bin/dhcp6/json_config_parser.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc index 58649c8ed2..de45d87216 100644 --- a/src/bin/dhcp6/json_config_parser.cc +++ b/src/bin/dhcp6/json_config_parser.cc @@ -172,13 +172,15 @@ public: excluded_prefix_len = getUint8(pd_pool_, "excluded-prefix-len"); } - if (pd_pool_->contains("option-data")) { + ConstElementPtr option_data = pd_pool_->get("option-data"); + if (option_data) { OptionDataListParser opts_parser(AF_INET6); - opts_parser.parse(options_, pd_pool_->get("option-data")); + opts_parser.parse(options_, option_data); } - if (pd_pool_->contains("user-context")) { - user_context_ = pd_pool_->get("user-context"); + ConstElementPtr user_context = pd_pool_->get("user-context"); + if (user_context) { + user_context_ = user_context; } // Check the pool parameters. It will throw an exception if any -- 2.47.2