From: Michal 'vorner' Vaner Date: Fri, 26 Oct 2012 18:15:53 +0000 (+0200) Subject: [2209] Don't release the zone table twice X-Git-Tag: trac2487_base~21^2~8^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84df8fb3d06ad81e04fee73b6a31890ddc03c33e;p=thirdparty%2Fkea.git [2209] Don't release the zone table twice Removing the release from the test, since the segment now destroys it itself. We can't check all memory is deallocated at that moment in the test (since we can't do it before the destroy -- it is not deallocated fully yet, and can't do it after also, since the memory segment doesn't exist). But that doesn't matter, since the segment checks by assert. --- diff --git a/src/lib/datasrc/tests/memory/zone_writer_unittest.cc b/src/lib/datasrc/tests/memory/zone_writer_unittest.cc index 03cfd7b06f..13bcc3b469 100644 --- a/src/lib/datasrc/tests/memory/zone_writer_unittest.cc +++ b/src/lib/datasrc/tests/memory/zone_writer_unittest.cc @@ -56,11 +56,6 @@ public: void TearDown() { // Release the writer writer_.reset(); - // Release the table we used - ZoneTable::destroy(segment_->getMemorySegment(), - segment_->getHeader().getTable()); - // And check we freed all memory - EXPECT_TRUE(segment_->getMemorySegment().allMemoryDeallocated()); } protected: scoped_ptr segment_;