synchronize parameter name cache access. Ref #246

F43nd1r · Apr 23, 2021 · 2b4b867 · 2b4b867
1 parent c12e27c
commit 2b4b867
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/acrarium/src/main/kotlin/com/faendir/acra/navigation/ParameterUIListener.kt b/acrarium/src/main/kotlin/com/faendir/acra/navigation/ParameterUIListener.kt
@@ -1,6 +1,7 @@
 package com.faendir.acra.navigation
 
 import com.faendir.acra.service.DataService
+import com.faendir.acra.util.catching
 import com.vaadin.flow.server.UIInitEvent
 import com.vaadin.flow.server.UIInitListener
 import org.springframework.context.support.GenericApplicationContext
@@ -11,13 +12,15 @@ import kotlin.reflect.full.createInstance
 
 @Component
 class ParameterUIListener(private val applicationContext: GenericApplicationContext, private val dataService: DataService) : UIInitListener {
+    private val nameCache = mutableSetOf<String>()
     override fun uiInit(uiInitEvent: UIInitEvent) {
-        val nameCache = mutableListOf<String>()
         uiInitEvent.ui.addBeforeEnterListener { event ->
             event.routeParameters.parameterNames.forEach {
                 val annotation = AnnotationUtils.findAnnotation(event.navigationTarget, ParseParameter::class.java)
                 val parameter = event.routeParameters.get(it).orElseThrow()
-                nameCache.add(it)
+                synchronized(nameCache) {
+                    nameCache.add(it)
+                }
                 if (annotation != null) {
                     registerParsedParameter(annotation.value.createInstance(), it, parameter)
                 } else {
@@ -26,8 +29,10 @@ class ParameterUIListener(private val applicationContext: GenericApplicationCont
             }
         }
         uiInitEvent.ui.addAfterNavigationListener {
-            nameCache.forEach { applicationContext.removeBeanDefinition(it) }
-            nameCache.clear()
+            synchronized(nameCache) {
+                nameCache.forEach { catching { applicationContext.removeBeanDefinition(it) } }
+                nameCache.clear()
+            }
         }
     }