BIND 10 master, updated. c2a34db25f4b0c903a025514cdff758e7ea55e42 [master] fix RRset cache update and re-enable test

[BIND 10 source code commits]

The branch, master has been updated
       via  c2a34db25f4b0c903a025514cdff758e7ea55e42 (commit)
      from  98908690535371b9128a1263c7a4b59150609526 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c2a34db25f4b0c903a025514cdff758e7ea55e42
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Feb 16 13:16:10 2011 +0000

    [master] fix RRset cache update and re-enable test

-----------------------------------------------------------------------

Summary of changes:
 src/lib/cache/rrset_cache.cc                  |    3 +--
 src/lib/cache/tests/message_cache_unittest.cc |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cache/rrset_cache.cc b/src/lib/cache/rrset_cache.cc
index 02a6a45..86ee867 100644
--- a/src/lib/cache/rrset_cache.cc
+++ b/src/lib/cache/rrset_cache.cc
@@ -76,11 +76,10 @@ RRsetCache::update(const isc::dns::RRset& rrset, const RRsetTrustLevel& level) {
             return (entry_ptr);
         } else {
             HashKey key = entry_ptr->hashKey();
-            rrset_table_.remove(key);
             entry_ptr.reset(new RRsetEntry(rrset, level));
             //TODO, lru list touch.
             // Replace the expired rrset entry if it exists.
-            rrset_table_.add(entry_ptr, key, true);
+            rrset_table_.add(entry_ptr, entry_ptr->hashKey(), true);
             return (entry_ptr);
         }
     }
diff --git a/src/lib/cache/tests/message_cache_unittest.cc b/src/lib/cache/tests/message_cache_unittest.cc
index 4e4a284..f984312 100644
--- a/src/lib/cache/tests/message_cache_unittest.cc
+++ b/src/lib/cache/tests/message_cache_unittest.cc
@@ -78,7 +78,7 @@ TEST_F(MessageCacheTest, testLookup) {
     EXPECT_TRUE(message_cache_->lookup(qname1, RRType::A(), message_render));
 }
 
-TEST_F(MessageCacheTest, DISABLED_testUpdate) {
+TEST_F(MessageCacheTest, testUpdate) {
     messageFromFile(message_parse, "message_fromWire4");
     EXPECT_TRUE(message_cache_->update(message_parse));