[2270] Fix for repeated reconf in dhcp6 (old defaults are now removed)

diff --git a/src/bin/dhcp6/config_parser.cc b/src/bin/dhcp6/config_parser.cc
index 6cc1872e84b7a6835f54ec825a28c0da07ddf4b6..5516614040332f2a702d4d3165c666c310726017 100644 (file)
--- a/src/bin/dhcp6/config_parser.cc
+++ b/src/bin/dhcp6/config_parser.cc
@@ -752,10 +752,15 @@ DhcpConfigParser* createGlobalDhcpConfigParser(const std::string& config_id) {
 ConstElementPtr
 configureDhcp6Server(Dhcpv6Srv& , ConstElementPtr config_set) {
     if (!config_set) {
-        isc_throw(Dhcp6ConfigError,
-                  "Null pointer is passed to configuration parser");
+        ConstElementPtr answer = isc::config::createAnswer(1,
+                                 string("Can't parse NULL config"));
+        return (answer);
     }
 
+    /// Let's wipe previous configuration defaults
+    uint32_defaults.clear();
+    string_defaults.clear();
+
     /// @todo: append most essential info here (like "2 new subnets configured")
     string config_details;