From: Francis Dupont <fdupont@isc.org>
Date: Fri, 27 Jan 2017 19:09:12 +0000 (+0100)
Subject: [5123] Foctorized calls to get
X-Git-Tag: trac5126_base~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a45648214245c8be0db4764148ba59f9ccb0f91d;p=thirdparty%2Fkea.git

[5123] Foctorized calls to get
---

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