From ac3db81741ac74614d9eeae70a3f2eae6dcc9548 Mon Sep 17 00:00:00 2001
From: Brian Chen <chenbrian@google.com>
Date: Fri, 14 May 2021 11:11:43 -0500
Subject: [PATCH] fix: add flush check in BulkWriter.sendBatchLocked() callback
 (#631)

---
 .../main/java/com/google/cloud/firestore/BulkWriter.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BulkWriter.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BulkWriter.java
index 8e104ed7a..bb9d75090 100644
--- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BulkWriter.java
+++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/BulkWriter.java
@@ -988,8 +988,10 @@ private void sendBatchLocked(final BulkCommitBatch batch, final boolean flush) {
               new Runnable() {
                 @Override
                 public void run() {
-                  synchronized (lock) {
-                    scheduleCurrentBatchLocked(flush);
+                  if (flush) {
+                    synchronized (lock) {
+                      scheduleCurrentBatchLocked(/* flush= */ true);
+                    }
                   }
                 }
               },