---

sduskis · chingor13 · commit 07a4ab99ec25 · 2019-04-24T12:54:03.000-07:00
yaml --- r: 35841 b: refs/heads/autosynth-dataproc c: cef6cd0 h: refs/heads/master i: 35839: f513d85
diff --git a/[refs] b/[refs]
@@ -165,7 +165,7 @@ refs/tags/v0.78.0: 62d4bd30605ab3578f9a08d84487fb0b33ac2ff5
 refs/tags/v0.79.0: 82287b570708748c411d05c40f3932cff9606feb
 refs/tags/v0.80.0: f745e744d38e4fe636f34d0e04795ba3d014287d
 refs/tags/v0.81.0: ed3a0c85339ea6b73560b9a570abfbb76b93a263
-refs/heads/autosynth-dataproc: 7f889b23478560861361715a9021c5477361f33e
+refs/heads/autosynth-dataproc: cef6cd03f92eb9ac491fcb97639769fd06cde841
 refs/heads/autosynth-securitycenter: b24087060036e623e57d2454ba5dabeaf1e530c5
 refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
 refs/tags/v0.82.0: 7b9807d5d0a400c757b8905fee768be4c85eba25
diff --git a/branches/autosynth-dataproc/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/autosynth-dataproc/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);
+      }
     }
   }
 
