---

sduskis · chingor13 · commit 35e1d2b40706 · 2019-04-24T12:54:03.000-07:00
yaml --- r: 34687 b: refs/heads/autosynth-texttospeech c: cef6cd0 h: refs/heads/master i: 34685: a485b40 34683: 00eb016 34679: 66cd0d9 34671: 22f4456 34655: 6f9597e 34623: 581a3b9 34559: abe1b95
diff --git a/[refs] b/[refs]
@@ -140,7 +140,7 @@ refs/heads/autosynth-scheduler: a3de6480746d1cd586ca8b9d75c55a636f371539
 refs/heads/autosynth-spanner: d963fe4368e79cf6abae5d511785e8ced8ac57f4
 refs/heads/autosynth-speech: c563dcd420cce0a37c39b1b9c24be1b9ba604dc7
 refs/heads/autosynth-tasks: 25d1eafe8cb66b00e3dad765dac74a5b45b83e63
-refs/heads/autosynth-texttospeech: 7f889b23478560861361715a9021c5477361f33e
+refs/heads/autosynth-texttospeech: cef6cd03f92eb9ac491fcb97639769fd06cde841
 refs/heads/autosynth-trace: c94eef6e4d9c6fd24888216e28ca7271959c1cf0
 refs/heads/autosynth-websecurityscanner: fa561b356aabcd92d415ae8dc88fd8d87dbc5b23
 refs/heads/bigquerystorage: 06db74d123d7f8a3ef48755c2fcabed09faf8e64
diff --git a/branches/autosynth-texttospeech/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/autosynth-texttospeech/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -222,14 +222,7 @@ && hasBatchingBytes()
         }
       }
       // Setup the next duration based delivery alarm if there are messages batched.
-      if (!messagesBatch.isEmpty()) {
-        setupDurationBasedPublishAlarm();
-      } else if (currentAlarmFuture != null) {
-        logger.log(Level.FINER, "Cancelling alarm, no more messages");
-        if (activeAlarm.getAndSet(false)) {
-          currentAlarmFuture.cancel(false);
-        }
-      }
+      setupAlarm();
     } finally {
       messagesBatchLock.unlock();
     }
@@ -266,22 +259,29 @@ public void run() {
     return publishResult;
   }
 
-  private void setupDurationBasedPublishAlarm() {
-    if (!activeAlarm.getAndSet(true)) {
-      long delayThresholdMs = getBatchingSettings().getDelayThreshold().toMillis();
-      logger.log(Level.FINER, "Setting up alarm for the next {0} ms.", delayThresholdMs);
-      currentAlarmFuture =
-          executor.schedule(
-              new Runnable() {
-                @Override
-                public void run() {
-                  logger.log(Level.FINER, "Sending messages based on schedule.");
-                  activeAlarm.getAndSet(false);
-                  publishAllOutstanding();
-                }
-              },
-              delayThresholdMs,
-              TimeUnit.MILLISECONDS);
+  private void setupAlarm() {
+    if (!messagesBatch.isEmpty()) {
+      if (!activeAlarm.getAndSet(true)) {
+        long delayThresholdMs = getBatchingSettings().getDelayThreshold().toMillis();
+        logger.log(Level.FINER, "Setting up alarm for the next {0} ms.", delayThresholdMs);
+        currentAlarmFuture =
+            executor.schedule(
+                new Runnable() {
+                  @Override
+                  public void run() {
+                    logger.log(Level.FINER, "Sending messages based on schedule.");
+                    activeAlarm.getAndSet(false);
+                    publishAllOutstanding();
+                  }
+                },
+                delayThresholdMs,
+                TimeUnit.MILLISECONDS);
+      }
+    } else if (currentAlarmFuture != null) {
+      logger.log(Level.FINER, "Cancelling alarm, no more messages");
+      if (activeAlarm.getAndSet(false)) {
+        currentAlarmFuture.cancel(false);
+      }
     }
   }
 
