From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Thu, 16 May 2013 14:15:36 +0000 (+0200)
Subject: [2836] Remove deprecated hack
X-Git-Tag: bind10-1.2.0beta1-release~457^2~1^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52588836afbc4f6d66fd93d30bc37867bfeb2eb8;p=thirdparty%2Fkea.git

[2836] Remove deprecated hack

The create now throws on relocation, so the whole operation is tried
again. No need to worry about object being relocated.
---

diff --git a/src/lib/datasrc/memory/zone_data_updater.cc b/src/lib/datasrc/memory/zone_data_updater.cc
index 734d40e1b6..a8a88e6642 100644
--- a/src/lib/datasrc/memory/zone_data_updater.cc
+++ b/src/lib/datasrc/memory/zone_data_updater.cc
@@ -234,12 +234,6 @@ ZoneDataUpdater::setupNSEC3(const ConstRRsetPtr rrset) {
     NSEC3Data* nsec3_data = zone_data_->getNSEC3Data();
     if (nsec3_data == NULL) {
         nsec3_data = NSEC3Data::create(mem_sgmt_, zone_name_, nsec3_rdata);
-        // The create above might have relocated data. So get it again,
-        // just to make sure.
-        zone_data_ =
-            static_cast<ZoneData*>(mem_sgmt_.
-                                   getNamedAddress("updater_zone_data").
-                                   second);
         zone_data_->setNSEC3Data(nsec3_data);
         zone_data_->setSigned(true);
     } else {