fix: multiple Queue instances being created (#190)

customerio · Apr 22, 2023 · 406626c · 406626c
1 parent f7fc984
commit 406626c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/sdk/src/main/java/io/customer/sdk/di/DiGraph.kt b/sdk/src/main/java/io/customer/sdk/di/DiGraph.kt
@@ -44,10 +44,13 @@ abstract class DiGraph {
      * ```
      */
     inline fun <reified INST : Any> getSingletonInstanceCreate(newInstanceCreator: () -> INST): INST {
-        val singletonKey = INST::class.java.simpleName
+        // Use a synchronized block to prevent multiple threads from creating multiple instances of the singleton.
+        synchronized(this) {
+            val singletonKey = INST::class.java.simpleName
 
-        return singletons[singletonKey] as? INST ?: newInstanceCreator().also {
-            singletons[singletonKey] = it
+            return singletons[singletonKey] as? INST ?: newInstanceCreator().also {
+                singletons[singletonKey] = it
+            }
         }
     }