Synchronized access to future

learningequality · Jan 11, 2024 · bf6fe20 · bf6fe20
1 parent 9b8b285
commit bf6fe20
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/python-for-android/dists/kolibri/src/main/java/org/learningequality/Task.java b/python-for-android/dists/kolibri/src/main/java/org/learningequality/Task.java
@@ -104,8 +104,10 @@ public static CompletableFuture<Boolean> reconcile(Context context, Executor exe
         // Run through all the states and check them, then process the results
         for (StateMap stateRef : StateMap.forReconciliation()) {
             chain = chain.thenComposeAsync((_didReconcile) -> {
-                if (future.isCancelled()) {
-                    return CompletableFuture.completedFuture(_didReconcile);
+                synchronized (future) {
+                    if (future.isCancelled()) {
+                        return CompletableFuture.completedFuture(_didReconcile);
+                    }
                 }
 
                 Log.i(TAG, "Requesting sentinel check state " + stateRef);