Skip to content

Commit 0d82897

Browse files
committed
Addressing feedback
1 parent eb693bd commit 0d82897

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/AbstractSubscriberConnection.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,7 @@ private static class ExpirationInfo implements Comparable<ExpirationInfo> {
9898

9999
void extendExpiration() {
100100
expiration = new Instant(clock.millis()).plus(Duration.standardSeconds(nextExtensionSeconds));
101-
nextExtensionSeconds = 2 * nextExtensionSeconds;
102-
if (nextExtensionSeconds > MAX_ACK_DEADLINE_EXTENSION_SECS) {
103-
nextExtensionSeconds = MAX_ACK_DEADLINE_EXTENSION_SECS;
104-
}
101+
nextExtensionSeconds = Math.min(2 * nextExtensionSeconds, MAX_ACK_DEADLINE_EXTENSION_SECS);
105102
}
106103

107104
@Override

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,7 @@ void sendAckOperations(
184184
}
185185
}
186186

187-
List<List<String>> ackChunks = Lists.partition(acksToSend, MAX_PER_REQUEST_CHANGES);
188-
Iterator<List<String>> ackChunksIt = ackChunks.iterator();
189-
while (ackChunksIt.hasNext()) {
190-
List<String> ackChunk = ackChunksIt.next();
187+
for (List<String> ackChunk : Lists.partition(acksToSend, MAX_PER_REQUEST_CHANGES)) {
191188
stub.withDeadlineAfter(DEFAULT_TIMEOUT.getMillis(), TimeUnit.MILLISECONDS)
192189
.acknowledge(
193190
AcknowledgeRequest.newBuilder()

0 commit comments

Comments
 (0)