From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Mon, 13 May 2013 12:45:17 +0000 (+0200)
Subject: [2836] The updater is never NULL in destructor
X-Git-Tag: bind10-1.2.0beta1-release~457^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cab68004571463fdaeefe5659380fbbf9c54e01;p=thirdparty%2Fkea.git

[2836] The updater is never NULL in destructor

So remove the condition to check it. Keep an assert there, just in case
there was a reason originally, so we know about it.
---

diff --git a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
index 7bb856b027..3a9d4a6642 100644
--- a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
@@ -81,12 +81,11 @@ protected:
     }
 
     ~ZoneDataUpdaterTest() {
-        if (updater_) {
-            ZoneData::destroy(*mem_sgmt_, getZoneData(), zclass_);
-            // Release the updater, so it frees all memory inside the segment too
-            updater_.reset();
-            mem_sgmt_->clearNamedAddress("Test zone data");
-        }
+        assert(updater_);
+        ZoneData::destroy(*mem_sgmt_, getZoneData(), zclass_);
+        // Release the updater, so it frees all memory inside the segment too
+        updater_.reset();
+        mem_sgmt_->clearNamedAddress("Test zone data");
         if (!mem_sgmt_->allMemoryDeallocated()) {
             ADD_FAILURE() << "Memory leak detected";
         }