Fixng a bad merge.

googleapis · Apr 18, 2019 · 7487e88 · 7487e88
1 parent 6be9e3d
commit 7487e88
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/...cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/...cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -344,7 +344,6 @@ private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch
     return publisherStub.publishCallable().futureCall(publishRequest.build());
   }
 
-
   private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
     final ApiFutureCallback<PublishResponse> futureCallback =
         new ApiFutureCallback<PublishResponse>() {

diff --git a/...ogle-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java b/...ogle-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
@@ -232,25 +232,25 @@ public void run() {
             }
           });
     }
-  }
 
-  /** Cancels every task in the queue assoicated with {@code key}. */
-  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) {
-      final Deque<Runnable> tasks = tasksByKey.get(key);
-      if (tasks == null) {
-        return;
-      }
-      while (!tasks.isEmpty()) {
-        Runnable task = tasks.poll();
-        if (task instanceof CancellableRunnable) {
-          ((CancellableRunnable) task).cancel(e);
-        } else {
-          logger.log(
-              Level.WARNING,
-              "Attempted to cancel Runnable that was not CancellableRunnable; ignored.");
+    /** Cancels every task in the queue assoicated with {@code key}. */
+    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) {
+        final Deque<Runnable> tasks = tasksByKey.get(key);
+        if (tasks == null) {
+          return;
+        }
+        while (!tasks.isEmpty()) {
+          Runnable task = tasks.poll();
+          if (task instanceof CancellableRunnable) {
+            ((CancellableRunnable) task).cancel(e);
+          } else {
+            logger.log(
+                Level.WARNING,
+                "Attempted to cancel Runnable that was not CancellableRunnable; ignored.");
+          }
         }
       }
     }