---

sduskis · sduskis · commit 21c6dc752618 · 2019-04-29T09:52:38.000-04:00
yaml --- r: 28255 b: refs/heads/pubsub-ordering-keys c: fd07e9e h: refs/heads/master i: 28253: 828e8cd 28251: dfe09bc 28247: ad2befe 28239: c59f551 28223: f81a5ad
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 42697e29d13bf388508328b6bc444efdbb1c121b
+refs/heads/pubsub-ordering-keys: fd07e9e34c822418a7ba335313b2a8312cb9fbf3
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -313,20 +313,22 @@ public void run() {
    */
   public void publishAllOutstanding() {
     messagesBatchLock.lock();
+    List<MessagesBatch> toSend;
     try {
-      for (MessagesBatch batch : messagesBatches.values()) {
-        if (!batch.isEmpty()) {
-          // TODO(kimkyung-goog): Do not release `messagesBatchLock` when publishing a batch. If
-          // it's released, the order of publishing cannot be guaranteed if `publish()` is called
-          // while this function is running. This locking mechanism needs to be improved if it
-          // causes any performance degradation.
-          publishOutstandingBatch(batch.popOutstandingBatch());
-        }
-      }
+      toSend = new ArrayList<>(messagesBatches.values());
       messagesBatches.clear();
     } finally {
       messagesBatchLock.unlock();
     }
+    for (MessagesBatch batch : toSend) {
+      if (!batch.isEmpty()) {
+        // TODO(kimkyung-goog): Do not release `messagesBatchLock` when publishing a batch. If
+        // it's released, the order of publishing cannot be guaranteed if `publish()` is called
+        // while this function is running. This locking mechanism needs to be improved if it
+        // causes any performance degradation.
+        publishOutstandingBatch(batch.popOutstandingBatch());
+      }
+    }
   }
 
   private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch) {
