Move HasCommit check inside lock in DataModel.Add (#66)

myieye · web-flow · commit 31dc78b75f44 · 2026-05-19T15:41:05.000+02:00
diff --git a/src/SIL.Harmony/DataModel.cs b/src/SIL.Harmony/DataModel.cs
@@ -114,8 +114,8 @@ private Commit NewCommit(Guid commitId, Guid clientId, CommitMetadata? commitMet
     private async Task Add(Commit commit)
     {
         await using var repo = await _crdtRepositoryFactory.CreateRepository();
-        if (await repo.HasCommit(commit.Id)) return;
         using var locked = await repo.Lock();
+        if (await repo.HasCommit(commit.Id)) return;
         repo.ClearChangeTracker();
 
         await using var transaction = repo.IsInTransaction ? null : await repo.BeginTransactionAsync();

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ private Commit NewCommit(Guid commitId, Guid clientId, CommitMetadata? commitMet`
`114`	`114`	`private async Task Add(Commit commit)`
`115`	`115`	`{`
`116`	`116`	`await using var repo = await _crdtRepositoryFactory.CreateRepository();`
`117`		`- if (await repo.HasCommit(commit.Id)) return;`
`118`	`117`	`using var locked = await repo.Lock();`
	`118`	`+ if (await repo.HasCommit(commit.Id)) return;`
`119`	`119`	`repo.ClearChangeTracker();`
`120`	`120`
`121`	`121`	`await using var transaction = repo.IsInTransaction ? null : await repo.BeginTransactionAsync();`