---

sduskis · web-flow · commit d061a95d5881 · 2019-04-18T11:24:21.000-04:00
yaml --- r: 27239 b: refs/heads/pubsub-ordering-keys c: 708d785 h: refs/heads/master i: 27237: d5cb520 27235: 1b23581 27231: 7cad448
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: 7487e880732ba7b1f4311033acb063299b2c6480
+refs/heads/pubsub-ordering-keys: 708d7850d6c8ebe6c82acb3019407b14c252a913
 "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/SequentialExecutorService.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
@@ -115,17 +115,17 @@ private static class AutoExecutor extends SequentialExecutor {
       super(executor);
     }
 
-    protected void execute(final String key, final Deque<Runnable> finalTasks) {
+    protected void execute(final String key, final Deque<Runnable> tasks) {
       executor.execute(
           new Runnable() {
             @Override
             public void run() {
-              invokeCallbackAndExecuteNext(key, finalTasks);
+              invokeCallbackAndExecuteNext(key, tasks);
             }
           });
     }
 
-    protected void invokeCallbackAndExecuteNext(final String key, final Deque<Runnable> tasks) {
+    private void invokeCallbackAndExecuteNext(final String key, final Deque<Runnable> tasks) {
       invokeCallback(tasks);
       synchronized (tasksByKey) {
         if (tasks.isEmpty()) {
@@ -137,13 +137,7 @@ protected void invokeCallbackAndExecuteNext(final String key, final Deque<Runnab
           return;
         }
       }
-      executor.execute(
-          new Runnable() {
-            @Override
-            public void run() {
-              invokeCallbackAndExecuteNext(key, tasks);
-            }
-          });
+      execute(key, tasks);
     }
   }
 
@@ -199,18 +193,18 @@ public void cancel(Throwable e) {
       return future;
     }
 
-    protected void execute(final String key, final Deque<Runnable> finalTasks) {
+    protected void execute(final String key, final Deque<Runnable> tasks) {
       executor.execute(
           new Runnable() {
             @Override
             public void run() {
-              invokeCallback(finalTasks);
+              invokeCallback(tasks);
             }
           });
     }
 
     /** Executes the next queued task associated with {@code key}. */
-    void resume(final String key) {
+    private void resume(String key) {
       Deque<Runnable> tasks;
       synchronized (tasksByKey) {
         tasks = tasksByKey.get(key);
@@ -222,19 +216,11 @@ void resume(final String key) {
           return;
         }
       }
-      final Deque<Runnable> finalTasks = tasks;
-      // Run the next task.
-      executor.execute(
-          new Runnable() {
-            @Override
-            public void run() {
-              invokeCallback(finalTasks);
-            }
-          });
+      execute(key, tasks);
     }
 
     /** Cancels every task in the queue assoicated with {@code key}. */
-    void cancelQueuedTasks(final String key, Throwable e) {
+    private void cancelQueuedTasks(final String key, Throwable e) {
       // TODO(kimkyung-goog): Ensure execute() fails once cancelQueueTasks() has been ever invoked,
       // so that no more tasks are scheduled.
       synchronized (tasksByKey) {
