Skip to content

Commit cce836d

Browse files
authored
---
yaml --- r: 28659 b: refs/heads/autosynth-dlp c: 8894854 h: refs/heads/master i: 28657: 77c6016 28655: d083ff3
1 parent 49719f8 commit cce836d

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

  • branches/autosynth-dlp/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ refs/tags/v0.60.0: 4cd518d0612329f8a8e53484eef4cd1651e32855
103103
refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
104104
refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
105105
refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
106-
refs/heads/autosynth-dlp: 909d0944c96347814c3ec56cb36fbd0c14f700a1
106+
refs/heads/autosynth-dlp: 8894854f9bcd487769ad9f38ce441a88577a4cf3
107107
refs/heads/autosynth-logging: eca54b98c8cf82050bbdfc5c19139673dff9e5b8
108108
refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
109109
refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6

branches/autosynth-dlp/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,15 +304,18 @@ public void publishAllOutstanding() {
304304
publishOutstandingBatch(batchToSend);
305305
}
306306

307-
private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
307+
private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch) {
308308
PublishRequest.Builder publishRequest = PublishRequest.newBuilder();
309309
publishRequest.setTopic(topicName);
310310
for (OutstandingPublish outstandingPublish : outstandingBatch.outstandingPublishes) {
311311
publishRequest.addMessages(outstandingPublish.message);
312312
}
313313

314-
ApiFutures.addCallback(
315-
publisherStub.publishCallable().futureCall(publishRequest.build()),
314+
return publisherStub.publishCallable().futureCall(publishRequest.build());
315+
}
316+
317+
private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
318+
ApiFutureCallback<PublishResponse> futureCallback =
316319
new ApiFutureCallback<PublishResponse>() {
317320
@Override
318321
public void onSuccess(PublishResponse result) {
@@ -351,8 +354,9 @@ public void onFailure(Throwable t) {
351354
messagesWaiter.incrementPendingMessages(-outstandingBatch.size());
352355
}
353356
}
354-
},
355-
directExecutor());
357+
};
358+
359+
ApiFutures.addCallback(publishCall(outstandingBatch), futureCallback, directExecutor());
356360
}
357361

358362
private static final class OutstandingBatch {

0 commit comments

Comments
 (0)