fix(model-server): RepositoriesManager.getVersionHash wasn't atomic

slisson · slisson · commit 10260f75b094 · 2024-02-20T13:34:33.000+01:00
diff --git a/model-server/src/main/kotlin/org/modelix/model/server/handlers/RepositoriesManager.kt b/model-server/src/main/kotlin/org/modelix/model/server/handlers/RepositoriesManager.kt
@@ -214,8 +214,10 @@ class RepositoriesManager(val client: LocalModelClient) {
     }
 
     fun getVersionHash(branch: BranchReference): String? {
-        return store[branchKey(branch)]
-            ?: store[legacyBranchKey(branch)]?.also { store.put(branchKey(branch), it, true) }
+        return store.runTransaction {
+            store[branchKey(branch)]
+                ?: store[legacyBranchKey(branch)]?.also { store.put(branchKey(branch), it, true) }
+        }
     }
 
     private fun putVersionHash(branch: BranchReference, hash: String?) {

Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,10 @@ class RepositoriesManager(val client: LocalModelClient) {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`fun getVersionHash(branch: BranchReference): String? {`
`217`		`- return store[branchKey(branch)]`
`218`		`- ?: store[legacyBranchKey(branch)]?.also { store.put(branchKey(branch), it, true) }`
	`217`	`+ return store.runTransaction {`
	`218`	`+ store[branchKey(branch)]`
	`219`	`+ ?: store[legacyBranchKey(branch)]?.also { store.put(branchKey(branch), it, true) }`
	`220`	`+ }`
`219`	`221`	`}`
`220`	`222`
`221`	`223`	`private fun putVersionHash(branch: BranchReference, hash: String?) {`