Avoid race condition in executors

invertase · Apr 3, 2021 · f7f1c1d · f7f1c1d
1 parent 50a4d98
commit f7f1c1d
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/packages/app/android/src/main/java/io/invertase/firebase/common/TaskExecutorService.java b/packages/app/android/src/main/java/io/invertase/firebase/common/TaskExecutorService.java
@@ -61,11 +61,15 @@ public ExecutorService getTransactionalExecutor(String identifier) {
 
   public ExecutorService getExecutor(boolean isTransactional, String identifier) {
     String executorName = getExecutorName(isTransactional, identifier);
-    ExecutorService existingExecutor = executors.get(executorName);
-    if (existingExecutor != null) return existingExecutor;
-    ExecutorService newExecutor = getNewExecutor(isTransactional);
-    executors.put(executorName, newExecutor);
-    return newExecutor;
+    synchronized(executors) {
+      ExecutorService existingExecutor = executors.get(executorName);
+      if (existingExecutor == null) {
+        ExecutorService newExecutor = getNewExecutor(isTransactional);
+        executors.put(executorName, newExecutor);
+        return newExecutor;
+      }
+    }
+    return existingExecutor;
   }
 
   private ExecutorService getNewExecutor(boolean isTransactional) {
@@ -106,10 +110,12 @@ public void shutdown() {
   }
 
   public void removeExecutor(String executorName) {
-    ExecutorService existingExecutor = executors.get(executorName);
-    if (existingExecutor != null) {
-      existingExecutor.shutdownNow();
-      executors.remove(executorName);
+    synchronized(executors) {
+      ExecutorService existingExecutor = executors.get(executorName);
+      if (existingExecutor != null) {
+        existingExecutor.shutdownNow();
+        executors.remove(executorName);
+      }
     }
   }
 }