Merge pull request #875 from Expensify/master

Update expensify_prod branch
Expensify · Sep 14, 2020 · 01e6e7b · 01e6e7b
2 parents d88ff3e + 9d6bc8c
commit 01e6e7b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sqlitecluster/SQLiteSequentialNotifier.cpp b/sqlitecluster/SQLiteSequentialNotifier.cpp
@@ -59,6 +59,7 @@ void SQLiteSequentialNotifier::cancel() {
     _globalResult = RESULT::CANCELED;
     for (auto& p : _valueToPendingThreadMap) {
         lock_guard<mutex> lock(p.second->waitingThreadMutex);
+        p.second->result = RESULT::CANCELED;
         p.second->waitingThreadConditionVariable.notify_all();
     }
     _valueToPendingThreadMap.clear();
@@ -70,6 +71,7 @@ void SQLiteSequentialNotifier::checkpointRequired(SQLite& db) {
     _globalResult = RESULT::CHECKPOINT_REQUIRED;
     for (auto& p : _valueToPendingThreadMap) {
         lock_guard<mutex> lock(p.second->waitingThreadMutex);
+        p.second->result = RESULT::CHECKPOINT_REQUIRED;
         p.second->waitingThreadConditionVariable.notify_all();
     }
     _valueToPendingThreadMap.clear();