summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--storage/src/vespa/storage/bucketdb/lockablemap.h4
-rw-r--r--storageserver/src/tests/storageservertest.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/bucketdb/lockablemap.h b/storage/src/vespa/storage/bucketdb/lockablemap.h
index 40e45b72c48..2670683f7e3 100644
--- a/storage/src/vespa/storage/bucketdb/lockablemap.h
+++ b/storage/src/vespa/storage/bucketdb/lockablemap.h
@@ -54,6 +54,10 @@ public:
const mapped_type* operator->() const { return &_value; }
mapped_type& operator*() { return _value; }
const mapped_type& operator*() const { return _value; }
+
+ const mapped_type *get() const { return &_value; }
+ mapped_type *get() { return &_value; }
+
void write();
void remove();
void unlock();
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp
index 5b4bae96a2f..ccd4d5a3720 100644
--- a/storageserver/src/tests/storageservertest.cpp
+++ b/storageserver/src/tests/storageservertest.cpp
@@ -693,8 +693,8 @@ namespace {
}
CPPUNIT_ASSERT_EQUAL(size_t(1), entries.size());
bucket = entries.begin()->first;
- auto *entry = &(*(entries.begin()->second));
auto *entry_wrapper = &(entries.begin()->second);
+ auto *entry = entry_wrapper->get();
if (seed % 95 == 93) { // Delete bucket
if ((entry->getBucketInfo().getChecksum() & 2) == 0) {
cmd.reset(new api::DeleteBucketCommand(bucket));