From: Peter van Dijk Date: Wed, 31 May 2023 08:25:12 +0000 (+0200) Subject: simplify X-Git-Tag: rec-4.10.0-alpha0~19^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd88b4b317aa347e95d723042e4b4098d1b619c;p=thirdparty%2Fpdns.git simplify --- diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc index 563522a6ae..5d58c436a5 100644 --- a/modules/lmdbbackend/lmdbbackend.cc +++ b/modules/lmdbbackend/lmdbbackend.cc @@ -1324,14 +1324,11 @@ bool LMDBBackend::deleteDomain(const DNSName& domain) auto txn = d_tdomains->getROTransaction(); txn.get_multi<0>(domain, idvec); - - if (idvec.empty()) { - throw std::runtime_error("in LMDBBackend::deleteDomain, domain was not found"); - } } - startTransaction(transactionDomain, transactionDomainId); - for (auto id : idvec) { + for (auto id : idvec) { + + startTransaction(domain, id); { // Remove metadata auto txn = d_tmeta->getRWTransaction(); @@ -1360,7 +1357,6 @@ bool LMDBBackend::deleteDomain(const DNSName& domain) // Remove records commitTransaction(); - startTransaction(transactionDomain, transactionDomainId); // Remove zone auto txn = d_tdomains->getRWTransaction(); @@ -1368,6 +1364,8 @@ bool LMDBBackend::deleteDomain(const DNSName& domain) txn.commit(); } + startTransaction(transactionDomain, transactionDomainId); + return true; }