Move the pair of shared_ptrs on return since there is multiple return points.

1 files changed, 1 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index e7c53516b58..7fcaf33d449 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -630,7 +630,7 @@ FileStorHandlerImpl::getNextMessage(uint16_t disk, uint8_t maxPriority)
                         takeDiskBucketLockOwnership(t, id, *msg));
                 MBUS_TRACE(trace, 9, "FileStorHandler: Got lock on bucket");
                 lockGuard.broadcast(); // XXX: needed here?
-                return {std::move(locker), std::move(msg)};
+                return std::move(FileStorHandler::LockedMessage(std::move(locker), std::move(msg)));
             } else {
                 std::shared_ptr<api::StorageReply> msgReply(
                         makeQueueTimeoutReply(*msg));