Merge branch 'master' into toregge/port-to-gcc-8

1 files changed, 7 insertions, 8 deletions

diff --git a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
index 12f91bf0fb6..adce60e3a66 100644
--- a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
+++ b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
@@ -24,15 +24,14 @@ DummyBucketExecutor::~DummyBucketExecutor() {
 
 std::unique_ptr<BucketTask>
 DummyBucketExecutor::execute(const Bucket & bucket, std::unique_ptr<BucketTask> task) {
-    {
-        std::unique_lock guard(_lock);
-        // Use contains when dropping support for gcc 8.
-        while (_inFlight.count(bucket.getBucket()) != 0) {
-            _cond.wait(guard);
-        }
-        _inFlight.insert(bucket.getBucket());
-    }
     _executor->execute(makeLambdaTask([this, bucket, bucketTask=std::move(task)]() {
+        {
+            std::unique_lock guard(_lock);
+            while (_inFlight.count(bucket.getBucket()) != 0) {
+                _cond.wait(guard);
+            }
+            _inFlight.insert(bucket.getBucket());
+        }
         bucketTask->run(bucket, makeLambdaCallback([this, bucket]() {
             std::unique_lock guard(_lock);
             // Use contains when dropping support for gcc 8.