Move the wait ahead of creating any tasks.

2 files changed, 2 insertions, 4 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
index 64c717ef824..1987ba81cad 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
@@ -119,7 +119,7 @@ void
 SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const FutureDoc & futureDoc,
                                     bool immediateCommit, OnOperationDoneType onWriteDone)
 {
-    const Document::UP & doc = std::move(futureDoc.get());
+    const Document::UP & doc = futureDoc.get();
     if (doc) {
         performIndexPut(serialNum, lid, *doc, immediateCommit, onWriteDone);
     }
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index 5549cef601e..1998fe806cc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -422,12 +422,10 @@ StoreOnlyFeedView::internalUpdate(FeedToken::UP token, const UpdateOperation &up
     FutureDoc futureDoc = promisedDoc.get_future().share();
     UpdateScope updateScope(getUpdateScope(upd));
     if (updateScope.hasIndexOrNonAttributeFields()) {
+        _pendingLidTracker.waitForConsumedLid(lid);
         if (updateScope._indexedFields) {
             updateIndexedFields(serialNum, lid, futureDoc, immediateCommit, onWriteDone);
         }
-
-        _pendingLidTracker.waitForConsumedLid(lid);
-
         if (useDocumentStore(serialNum)) {
             putSummary(serialNum, lid, futureDoc);
         }