Skip to content

Commit f2811d0

Browse files
authored
---
yaml --- r: 28073 b: refs/heads/autosynth-dialogflow c: 8894854 h: refs/heads/master i: 28071: 38c80f3
1 parent 7bce68b commit f2811d0

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

  • branches/autosynth-dialogflow/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
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigtable: 9e5429f45cf9face9fed585d0233534993e36b58
128128
refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
129129
refs/heads/autosynth-containeranalysis: af5b804492292b43372c9fe00386696136ccae89
130130
refs/heads/autosynth-datastore: d0fc1187000c7a50d8bddd89c3b7cdf1187ecb96
131-
refs/heads/autosynth-dialogflow: 909d0944c96347814c3ec56cb36fbd0c14f700a1
131+
refs/heads/autosynth-dialogflow: 8894854f9bcd487769ad9f38ce441a88577a4cf3
132132
refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
133133
refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3
134134
refs/heads/autosynth-iot: 4025d1804241e74d54950a324dc4f667aeaad4b3

branches/autosynth-dialogflow/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)