fix: add flush check in BulkWriter.sendBatchLocked() callback (#631)

Brian Chen · web-flow · commit ac3db81741ac · 2021-05-14T11:11:43.000-05:00
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
@@ -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);
+                    }
                   }
                 }
               },

Original file line number	Diff line number	Diff line change
`@@ -988,8 +988,10 @@ private void sendBatchLocked(final BulkCommitBatch batch, final boolean flush) {`
`988`	`988`	`new Runnable() {`
`989`	`989`	`@Override`
`990`	`990`	`public void run() {`
`991`		`- synchronized (lock) {`
`992`		`- scheduleCurrentBatchLocked(flush);`
	`991`	`+ if (flush) {`
	`992`	`+ synchronized (lock) {`
	`993`	`+ scheduleCurrentBatchLocked(/* flush= */ true);`
	`994`	`+ }`
`993`	`995`	`}`
`994`	`996`	`}`
`995`	`997`	`},`