[svn] commit: r3477 - in /branches/trac408/src/lib/nsas: hash_table.h tests/hash_table_unittest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Sat Nov 6 22:14:47 UTC 2010
Author: vorner
Date: Sat Nov 6 22:14:47 2010
New Revision: 3477
Log:
Fix hash table result
It was inconsistent with the documentation.
Modified:
branches/trac408/src/lib/nsas/hash_table.h
branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc
Modified: branches/trac408/src/lib/nsas/hash_table.h
==============================================================================
--- branches/trac408/src/lib/nsas/hash_table.h (original)
+++ branches/trac408/src/lib/nsas/hash_table.h Sat Nov 6 22:14:47 2010
@@ -212,11 +212,11 @@
scoped_lock lock(table_[index].mutex_);
boost::shared_ptr<T> result(getInternal(key, index));
if (result) {
- return (std::pair<bool, boost::shared_ptr<T> >(true, result));
+ return (std::pair<bool, boost::shared_ptr<T> >(false, result));
} else {
result = generator();
addInternal(result, key, index);
- return (std::pair<bool, boost::shared_ptr<T> >(false, result));
+ return (std::pair<bool, boost::shared_ptr<T> >(true, result));
}
}
Modified: branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc
==============================================================================
--- branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc (original)
+++ branches/trac408/src/lib/nsas/tests/hash_table_unittest.cc Sat Nov 6 22:14:47 2010
@@ -189,12 +189,12 @@
// Check it looks it up
std::pair<bool, shared_ptr<TestEntry> > result = table_.getOrAdd(
dummy1_->hashKey(), boost::bind(pass, dummy3_));
- EXPECT_TRUE(result.first);
+ EXPECT_FALSE(result.first);
EXPECT_EQ(dummy1_.get(), result.second.get());
// Check it says it adds the value
result = table_.getOrAdd(dummy3_->hashKey(), boost::bind(pass, dummy3_));
- EXPECT_FALSE(result.first);
+ EXPECT_TRUE(result.first);
EXPECT_EQ(dummy3_.get(), result.second.get());
// Check it really did add it
More information about the bind10-changes
mailing list