From b0185749265eee0f98c17c046a8b1152ef226a91 Mon Sep 17 00:00:00 2001
From: Brian Chen <chenbrian@google.com>
Date: Fri, 14 May 2021 10:45:15 -0500
Subject: [PATCH 1/2] fix: add flush check in BulkWriter.sendBatchLocked()
 callback

---
 .../src/main/java/com/google/cloud/firestore/BulkWriter.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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..d1939806e 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
@@ -989,7 +989,9 @@ private void sendBatchLocked(final BulkCommitBatch batch, final boolean flush) {
                 @Override
                 public void run() {
                   synchronized (lock) {
-                    scheduleCurrentBatchLocked(flush);
+                    if (flush) {
+                      scheduleCurrentBatchLocked(/* flush= */ true);
+                    }
                   }
                 }
               },

From 9f1ae9a30b5ba521b23683ec9e68e9c5c23cb828 Mon Sep 17 00:00:00 2001
From: Brian Chen <chenbrian@google.com>
Date: Fri, 14 May 2021 11:02:02 -0500
Subject: [PATCH 2/2] review

---
 .../src/main/java/com/google/cloud/firestore/BulkWriter.java  | 4 ++--
 1 file changed, 2 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 d1939806e..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,8 @@ private void sendBatchLocked(final BulkCommitBatch batch, final boolean flush) {
               new Runnable() {
                 @Override
                 public void run() {
-                  synchronized (lock) {
-                    if (flush) {
+                  if (flush) {
+                    synchronized (lock) {
                       scheduleCurrentBatchLocked(/* flush= */ true);
                     }
                   }