Merge pull request #368 from modelix/bugfix/version-change-detector

fix(model-client): memory leak in VersionChangeDetector
modelix · Dec 9, 2023 · e9ec983 · e9ec983
2 parents b15ba97 + 29b43c9
commit e9ec983
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/model-client/src/jvmMain/kotlin/org/modelix/model/client/RestWebModelClient.kt b/model-client/src/jvmMain/kotlin/org/modelix/model/client/RestWebModelClient.kt
@@ -371,7 +371,7 @@ class RestWebModelClient @JvmOverloads constructor(
         return runBlocking { getA(key) }
     }
 
-    suspend fun getA(key: String): String? {
+    override suspend fun getA(key: String): String? {
         val isHash = HashUtil.isSha256(key)
         if (isHash) {
             if (LOG.isDebugEnabled) {

diff --git a/model-client/src/jvmMain/kotlin/org/modelix/model/client/VersionChangeDetector.kt b/model-client/src/jvmMain/kotlin/org/modelix/model/client/VersionChangeDetector.kt
@@ -69,7 +69,7 @@ abstract class VersionChangeDetector(
             store.listen(key, keyListener)
             while (isActive) {
                 try {
-                    val version = store[key]
+                    val version = store.getA(key)
                     if (version != lastVersionHash) {
                         LOG.debug { "New version detected by polling: $version" }
                         versionChanged(version)

diff --git a/model-datastructure/src/commonMain/kotlin/org/modelix/model/IKeyValueStore.kt b/model-datastructure/src/commonMain/kotlin/org/modelix/model/IKeyValueStore.kt
@@ -17,6 +17,7 @@ package org.modelix.model
 
 interface IKeyValueStore {
     operator fun get(key: String): String?
+    suspend fun getA(key: String): String? = get(key)
     fun put(key: String, value: String?)
     fun getAll(keys: Iterable<String>): Map<String, String?>
     fun putAll(entries: Map<String, String?>)

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
@@ -165,6 +165,7 @@ class RepositoriesManager(val client: LocalModelClient) {
                 mergedVersion.hash
             }
             putVersionHash(branch, mergedHash)
+            ensureRepositoriesAreInList(setOf(branch.repositoryId))
             ensureBranchesAreInList(branch.repositoryId, setOf(branch.branchName))
             result = mergedHash
         }