---

sduskis · web-flow · commit fe8ff195fa17 · 2019-04-25T11:03:56.000-04:00
yaml --- r: 31521 b: refs/heads/autosynth-containeranalysis c: 909b0e8 h: refs/heads/master i: 31519: 29faed0
diff --git a/[refs] b/[refs]
@@ -126,7 +126,7 @@ refs/heads/autosynth-bigquerydatatransfer: 71b6b6d2a992d05999b53e6e130c4fc1c8c8b
 refs/heads/autosynth-bigquerystorage: a345f72d7a6358e9fea9dcdae94ec85a27da3088
 refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
-refs/heads/autosynth-containeranalysis: e67fd018a79de01181f1806a4597055d5d2104bb
+refs/heads/autosynth-containeranalysis: 909b0e8ef2d87a5d75da3ebfb595868a94645aae
 refs/heads/autosynth-datastore: d0fc1187000c7a50d8bddd89c3b7cdf1187ecb96
 refs/heads/autosynth-dialogflow: 841930a680ebe370c9fc6ae824465f6bc51a5a46
 refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
diff --git a/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/autosynth-containeranalysis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -197,23 +197,22 @@ public ApiFuture<String> publish(PubsubMessage message) {
     }
 
     message = messageTransform.apply(message);
-    final int messageSize = message.getSerializedSize();
     OutstandingBatch batchToSend = null;
-    SettableApiFuture<String> publishResult = SettableApiFuture.<String>create();
-    final OutstandingPublish outstandingPublish = new OutstandingPublish(publishResult, message);
+    final OutstandingPublish outstandingPublish = new OutstandingPublish(message);
     messagesBatchLock.lock();
     try {
       // Check if the next message makes the current batch exceed the max batch byte size.
       if (!messagesBatch.isEmpty()
           && hasBatchingBytes()
-          && messagesBatch.getBatchedBytes() + messageSize >= getMaxBatchBytes()) {
+          && messagesBatch.getBatchedBytes() + outstandingPublish.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()) {
-        messagesBatch.addMessage(outstandingPublish, messageSize);
+      if (!hasBatchingBytes() || outstandingPublish.messageSize < getMaxBatchBytes()) {
+        messagesBatch.addMessage(outstandingPublish, outstandingPublish.messageSize);
 
         // If after adding the message we have reached the batch max messages then we have a batch
         // to send.
@@ -243,20 +242,21 @@ public void run() {
 
     // If the message is over the size limit, it was not added to the pending messages and it will
     // be sent in its own batch immediately.
-    if (hasBatchingBytes() && messageSize >= getMaxBatchBytes()) {
+    if (hasBatchingBytes() && outstandingPublish.messageSize >= getMaxBatchBytes()) {
       logger.log(
           Level.FINER, "Message exceeds the max batch bytes, scheduling it for immediate send.");
       executor.execute(
           new Runnable() {
             @Override
             public void run() {
               publishOutstandingBatch(
-                  new OutstandingBatch(ImmutableList.of(outstandingPublish), messageSize));
+                  new OutstandingBatch(
+                      ImmutableList.of(outstandingPublish), outstandingPublish.messageSize));
             }
           });
     }
 
-    return publishResult;
+    return outstandingPublish.publishResult;
   }
 
   private void setupAlarm() {
@@ -382,12 +382,14 @@ public int size() {
   }
 
   private static final class OutstandingPublish {
-    SettableApiFuture<String> publishResult;
-    PubsubMessage message;
+    final SettableApiFuture<String> publishResult;
+    final PubsubMessage message;
+    final int messageSize;
 
-    OutstandingPublish(SettableApiFuture<String> publishResult, PubsubMessage message) {
-      this.publishResult = publishResult;
+    OutstandingPublish(PubsubMessage message) {
+      this.publishResult = SettableApiFuture.create();
       this.message = message;
+      this.messageSize = message.getSerializedSize();
     }
   }
 
