---

sduskis · sduskis · commit ad1da67d05ac · 2019-04-22T18:31:56.000-04:00
yaml --- r: 27257 b: refs/heads/pubsub-ordering-keys c: c90b83c h: refs/heads/master i: 27255: 223267a
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: 02e06aefcce3479ad5f74532ab979f8ce332d740
+refs/heads/pubsub-ordering-keys: c90b83c7810351b9f8c050d76d7cbf0aaed1446a
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
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
@@ -234,30 +234,30 @@ public ApiFuture<String> publish(PubsubMessage message) {
     messagesBatchLock.lock();
     try {
       // Check if the next message makes the current batch exceed the max batch byte size.
-      MessagesBatch messageBatch = messagesBatches.get(orderingKey);
-      if (messageBatch == null) {
-        messageBatch = new MessagesBatch(orderingKey);
-        messagesBatches.put(orderingKey, messageBatch);
+      MessagesBatch messagesBatch = messagesBatches.get(orderingKey);
+      if (messagesBatch == null) {
+        messagesBatch = new MessagesBatch(orderingKey);
+        messagesBatches.put(orderingKey, messagesBatch);
       }
-      if (!messageBatch.isEmpty()
+      if (!messagesBatch.isEmpty()
           && hasBatchingBytes()
-          && messageBatch.getBatchedBytes() + messageSize >= getMaxBatchBytes()) {
-        batchToSend = messageBatch.popOutstandingBatch();
+          && messagesBatch.getBatchedBytes() + messageSize >= getMaxBatchBytes()) {
+        batchToSend = messagesBatch.popOutstandingBatch();
       }
 
       // Border case if the message to send is greater or equals to the max batch size then can't
       // be included in the current batch and instead sent immediately.
       if (!hasBatchingBytes() || messageSize < getMaxBatchBytes()) {
-        messageBatch.addMessage(outstandingPublish, messageSize);
+        messagesBatch.addMessage(outstandingPublish, messageSize);
         // If after adding the message we have reached the batch max messages then we have a batch
         // to send.
-        if (messageBatch.getMessagesCount() == getBatchingSettings().getElementCountThreshold()) {
-          batchToSend = messageBatch.popOutstandingBatch();
+        if (messagesBatch.getMessagesCount() == getBatchingSettings().getElementCountThreshold()) {
+          batchToSend = messagesBatch.popOutstandingBatch();
         }
       }
 
       // Setup the next duration based delivery alarm if there are messages batched.
-      if (!messageBatch.isEmpty()) {
+      if (!messagesBatch.isEmpty()) {
         setupDurationBasedPublishAlarm();
       } else {
         messagesBatches.remove(orderingKey);
