Skip to content

Commit bd207c2

Browse files
committed
fix: Rework save locking
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent 8959cc9 commit bd207c2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

lib/Service/DocumentService.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -360,15 +360,16 @@ public function autosave(?File $file, int $documentId, int $version, ?string $au
360360
$this->writeDocumentState($file->getId(), $documentState);
361361
}
362362
});
363+
$document->setLastSavedVersion($stepsVersion);
364+
$document->setLastSavedVersionTime(time());
365+
$document->setLastSavedVersionEtag($file->getEtag());
366+
$this->documentMapper->update($document);
363367
} catch (LockedException $e) {
364368
// Ignore lock since it might occur when multiple people save at the same time
365369
return $document;
370+
} finally {
371+
$this->cache->remove('document-save-lock-' . $documentId);
366372
}
367-
$document->setLastSavedVersion($stepsVersion);
368-
$document->setLastSavedVersionTime(time());
369-
$document->setLastSavedVersionEtag($file->getEtag());
370-
$this->documentMapper->update($document);
371-
$this->cache->remove('document-save-lock-' . $documentId);
372373
return $document;
373374
}
374375

0 commit comments

Comments
 (0)