[2936] Handle rare relocation

8da51f50 · Michal 'vorner' Vaner · 52588836 · 8da51f50
Commit 8da51f50 authored May 16, 2013 by Michal 'vorner' Vaner
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/lib/datasrc/memory/zone_data_updater.h src/lib/datasrc/memory/zone_data_updater.h +7 -1

No files found.
--- a/src/lib/datasrc/memory/zone_data_updater.h
+++ b/src/lib/datasrc/memory/zone_data_updater.h
@@ -80,7 +80,13 @@ public:
            isc_throw(isc::InvalidOperation, "A ZoneDataUpdater already exists"
                      " on this memory segment. Destroy it first.");
        }
-        mem_sgmt_.setNamedAddress("updater_zone_data", zone_data_);
+        if (mem_sgmt_.setNamedAddress("updater_zone_data", zone_data_)) {
+            // It might have relocated during the set
+            zone_data_ =
+                static_cast<ZoneData*>(mem_sgmt_.getNamedAddress("updater_zone_data").
+                                       second);
+        }
+        assert(zone_data_);
    }

    /// The destructor.