getReplySP => stealReplySP

4 files changed, 8 insertions, 8 deletions

diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index 3b3846c3278..45226995e46 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -230,7 +230,7 @@ MergeHandlerTest::testGetBucketDiffChain(bool midChain)
     LOG(debug, "Verifying that get bucket diff is sent on");
     api::GetBucketDiffCommand cmd(_bucket, _nodes, _maxTimestamp);
     MessageTracker::UP tracker1 = handler.handleGetBucketDiff(cmd, *_context);
-    api::StorageMessage::SP replySent = tracker1->getReplySP();
+    api::StorageMessage::SP replySent = tracker1->stealReplySP();
 
     if (midChain) {
         LOG(debug, "Check state");
@@ -279,7 +279,7 @@ MergeHandlerTest::testApplyBucketDiffChain(bool midChain)
     LOG(debug, "Verifying that apply bucket diff is sent on");
     api::ApplyBucketDiffCommand cmd(_bucket, _nodes, _maxTimestamp);
     MessageTracker::UP tracker1 = handler.handleApplyBucketDiff(cmd, *_context);
-    api::StorageMessage::SP replySent = tracker1->getReplySP();
+    api::StorageMessage::SP replySent = tracker1->stealReplySP();
 
     if (midChain) {
         LOG(debug, "Check state");
@@ -724,7 +724,7 @@ TEST_F(MergeHandlerTest, entry_removed_after_get_bucket_diff) {
 
     auto tracker = handler.handleApplyBucketDiff(*applyBucketDiffCmd, *_context);
 
-    auto applyBucketDiffReply = std::dynamic_pointer_cast<api::ApplyBucketDiffReply>(tracker->getReplySP());
+    auto applyBucketDiffReply = std::dynamic_pointer_cast<api::ApplyBucketDiffReply>(tracker->stealReplySP());
     ASSERT_TRUE(applyBucketDiffReply.get());
 
     auto& diff = applyBucketDiffReply->getDiff();
@@ -1149,7 +1149,7 @@ TEST_F(MergeHandlerTest, remove_put_on_existing_timestamp) {
 
     auto tracker = handler.handleApplyBucketDiff(*applyBucketDiffCmd, *_context);
 
-    auto applyBucketDiffReply = std::dynamic_pointer_cast<api::ApplyBucketDiffReply>(tracker->getReplySP());
+    auto applyBucketDiffReply = std::dynamic_pointer_cast<api::ApplyBucketDiffReply>(tracker->stealReplySP());
     ASSERT_TRUE(applyBucketDiffReply.get());
 
     api::MergeBucketCommand cmd(_bucket, _nodes, _maxTimestamp);
diff --git a/storage/src/tests/persistence/processalltest.cpp b/storage/src/tests/persistence/processalltest.cpp
index e33e692b7d2..f7f52761609 100644
--- a/storage/src/tests/persistence/processalltest.cpp
+++ b/storage/src/tests/persistence/processalltest.cpp
@@ -29,7 +29,7 @@ TEST_F(ProcessAllHandlerTest, remove_location) {
               "DocEntry(2345, 1, id:mail:testdoctype1:n=4:4008.html)\n",
               dumpBucket(bucketId));
 
-    auto reply = std::dynamic_pointer_cast<api::RemoveLocationReply>(tracker->getReplySP());
+    auto reply = std::dynamic_pointer_cast<api::RemoveLocationReply>(tracker->stealReplySP());
     ASSERT_TRUE(reply);
     EXPECT_EQ(2u, reply->documents_removed());
 }
@@ -62,7 +62,7 @@ TEST_F(ProcessAllHandlerTest, remove_location_document_subset) {
               "DocEntry(109, 0, Doc(id:mail:testdoctype1:n=4:6925.html))\n",
               dumpBucket(bucketId));
 
-    auto reply = std::dynamic_pointer_cast<api::RemoveLocationReply>(tracker->getReplySP());
+    auto reply = std::dynamic_pointer_cast<api::RemoveLocationReply>(tracker->stealReplySP());
     ASSERT_TRUE(reply);
     EXPECT_EQ(5u, reply->documents_removed());
 }
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 7b220f39a90..f5a6f370dee 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -907,7 +907,7 @@ PersistenceThread::processLockedMessage(FileStorHandler::LockedMessage & lock) {
         }
         LOG(spam, "Sending reply up: %s %" PRIu64,
             tracker->getReply().toString().c_str(), tracker->getReply().getMsgId());
-        _env._fileStorHandler.sendReply(tracker->getReplySP());
+        _env._fileStorHandler.sendReply(tracker->stealReplySP());
     }
 }
 
diff --git a/storage/src/vespa/storage/persistence/persistenceutil.h b/storage/src/vespa/storage/persistence/persistenceutil.h
index de996a81390..1311ccf66ea 100644
--- a/storage/src/vespa/storage/persistence/persistenceutil.h
+++ b/storage/src/vespa/storage/persistence/persistenceutil.h
@@ -49,7 +49,7 @@ public:
     api::StorageReply & getReply() {
         return *_reply;
     }
-    api::StorageReply::SP getReplySP() {
+    api::StorageReply::SP stealReplySP() {
         return std::move(_reply);
     }