Skip to content

Commit 8356f78

Browse files
authored
---
yaml --- r: 32719 b: refs/heads/autosynth-iot c: 8894854 h: refs/heads/master i: 32717: eca43e9 32715: 2c27abe 32711: 0b6be05 32703: cb1013d
1 parent e7a8c28 commit 8356f78

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

  • branches/autosynth-iot/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
@@ -131,7 +131,7 @@ refs/heads/autosynth-datastore: f1efc3dc465174f41041acd56cf29badcec3e5bd
131131
refs/heads/autosynth-dialogflow: 73974cc32e5212aec0126472e0bc1442886fedaf
132132
refs/heads/autosynth-errorreporting: effe8001d110ad584187b30aafc473db0dd4a15f
133133
refs/heads/autosynth-firestore: e79eeb26930dfae4439424ad2fda5874eeca54c8
134-
refs/heads/autosynth-iot: 909d0944c96347814c3ec56cb36fbd0c14f700a1
134+
refs/heads/autosynth-iot: 8894854f9bcd487769ad9f38ce441a88577a4cf3
135135
refs/heads/autosynth-kms: 6b65b0f34c12d141031c7288cdc01e550212d0f6
136136
refs/heads/autosynth-language: e73905aa7672afa47240e65b25c087207f4594f9
137137
refs/heads/autosynth-os-login: 123ba209c5769d0ee067e0ce5848bec13b42a4f4

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