---

sduskis · web-flow · commit 8d86c06b7e1c · 2019-04-18T10:11:44.000-04:00
yaml --- r: 27589 b: refs/heads/mrschmidt-collectiongroup c: 8894854 h: refs/heads/master i: 27587: 24845db
diff --git a/[refs] b/[refs]
@@ -173,7 +173,7 @@ refs/heads/autosynth-securitycenter: f2f2feb8f3949c986d37e55cd23cdb0ce774f287
 refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
 refs/heads/cscc-samples: 620d105e6b574cfeeee04e413a157b7bd34ebc8b
 refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
-refs/heads/mrschmidt-collectiongroup: 909d0944c96347814c3ec56cb36fbd0c14f700a1
+refs/heads/mrschmidt-collectiongroup: 8894854f9bcd487769ad9f38ce441a88577a4cf3
 refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
 refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
 refs/heads/v4support: aa837fd70877f5a0628d8036e88952db035b792c
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -304,15 +304,18 @@ public void publishAllOutstanding() {
     publishOutstandingBatch(batchToSend);
   }
 
-  private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
+  private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch) {
     PublishRequest.Builder publishRequest = PublishRequest.newBuilder();
     publishRequest.setTopic(topicName);
     for (OutstandingPublish outstandingPublish : outstandingBatch.outstandingPublishes) {
       publishRequest.addMessages(outstandingPublish.message);
     }
 
-    ApiFutures.addCallback(
-        publisherStub.publishCallable().futureCall(publishRequest.build()),
+    return publisherStub.publishCallable().futureCall(publishRequest.build());
+  }
+
+  private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
+    ApiFutureCallback<PublishResponse> futureCallback =
         new ApiFutureCallback<PublishResponse>() {
           @Override
           public void onSuccess(PublishResponse result) {
@@ -351,8 +354,9 @@ public void onFailure(Throwable t) {
               messagesWaiter.incrementPendingMessages(-outstandingBatch.size());
             }
           }
-        },
-        directExecutor());
+        };
+
+    ApiFutures.addCallback(publishCall(outstandingBatch), futureCallback, directExecutor());
   }
 
   private static final class OutstandingBatch {
