From: Francis Dupont <fdupont@isc.org>
Date: Sat, 22 Sep 2018 14:45:53 +0000 (+0200)
Subject: [65-libyang-database] New fixes
X-Git-Tag: 171-keactrl-tests-not-posix_base~7^2~1^2^2~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e791ec4c48eba311b8e23e9ed85bbab38230e29;p=thirdparty%2Fkea.git

[65-libyang-database] New fixes
---

diff --git a/src/lib/yang/translator_database.cc b/src/lib/yang/translator_database.cc
index dfbf23df9d..1fdc8d7bc4 100644
--- a/src/lib/yang/translator_database.cc
+++ b/src/lib/yang/translator_database.cc
@@ -41,9 +41,7 @@ ElementPtr
 TranslatorDatabase::getDatabaseKea(const string& xpath) {
     ConstElementPtr type = getItem(xpath + "/database-type");
     if (!type) {
-        // Can't happen as database-type is the key.
-        isc_throw(Unexpected, "getDatabaseKea requires database-type: "
-                  << xpath);
+        return (ElementPtr());
     }
     ElementPtr result = Element::createMap();
     result->set("type", type);
diff --git a/src/lib/yang/translator_database.h b/src/lib/yang/translator_database.h
index 6c91c94843..7d30a62760 100644
--- a/src/lib/yang/translator_database.h
+++ b/src/lib/yang/translator_database.h
@@ -101,7 +101,7 @@ protected:
     /// @brief getDatabase JSON for kea-dhcp[46].
     ///
     /// @param xpath The xpath of the database.
-    /// @return JSON representation of the database.
+    /// @return JSON representation of the database or null if none.
     /// @throw SysrepoError when sysrepo raises an error.
     isc::data::ElementPtr getDatabaseKea(const std::string& xpath);