[3697] Applied and reindented the proposed patch

diff --git a/src/bin/dhcp6/kea_controller.cc b/src/bin/dhcp6/kea_controller.cc
index e28fd41205186041cd3b2d6a1fa8489e4de5c6ac..18d416dc5ca330f05fd08d8f2b7f8e41d23ffa76 100644 (file)
--- a/src/bin/dhcp6/kea_controller.cc
+++ b/src/bin/dhcp6/kea_controller.cc
@@ -69,6 +69,17 @@ void configure(const std::string& file_name) {
             isc_throw(isc::BadValue, "no configuration found");
         }
 
+        // Let's do sanity check before we call json->get() which
+        // works only for map.
+        if (json->getType() != isc::data::Element::map) {
+            isc_throw(isc::BadValue, "Configuration file is expected to be "
+                     "a map, i.e., start with { and end with } and contain "
+                     "at least an entry called 'Dhcp6' that itself is a map. "
+                     << file_name
+                      << " is a valid JSON, but its top element is not a map."
+                     " Did you forget to add { } around your configuration?");
+        }
+
         // Let's configure logging before applying the configuration,
         // so we can log things during configuration process.
         // If there's no logging element, we'll just pass NULL pointer,