---

davidtorres · davidtorres · commit 73955c3d0eb4 · 2016-12-19T17:02:36.000-05:00
yaml --- r: 7765 b: refs/heads/tswast-patch-1 c: 0d82897 h: refs/heads/master i: 7763: 5d5dcf6
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: eb693bdf8ffe69b548efe91cb9e8a027898dfb19
+refs/heads/tswast-patch-1: 0d82897a5bef7183c13e94065e50e11cc08e6071
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/AbstractSubscriberConnection.java b/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/AbstractSubscriberConnection.java
@@ -98,10 +98,7 @@ private static class ExpirationInfo implements Comparable<ExpirationInfo> {
 
     void extendExpiration() {
       expiration = new Instant(clock.millis()).plus(Duration.standardSeconds(nextExtensionSeconds));
-      nextExtensionSeconds = 2 * nextExtensionSeconds;
-      if (nextExtensionSeconds > MAX_ACK_DEADLINE_EXTENSION_SECS) {
-        nextExtensionSeconds = MAX_ACK_DEADLINE_EXTENSION_SECS;
-      }
+      nextExtensionSeconds = Math.min(2 * nextExtensionSeconds, MAX_ACK_DEADLINE_EXTENSION_SECS);
     }
 
     @Override
diff --git a/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java b/branches/tswast-patch-1/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java
@@ -184,10 +184,7 @@ void sendAckOperations(
       }
     }
 
-    List<List<String>> ackChunks = Lists.partition(acksToSend, MAX_PER_REQUEST_CHANGES);
-    Iterator<List<String>> ackChunksIt = ackChunks.iterator();
-    while (ackChunksIt.hasNext()) {
-      List<String> ackChunk = ackChunksIt.next();
+    for (List<String> ackChunk : Lists.partition(acksToSend, MAX_PER_REQUEST_CHANGES)) {
       stub.withDeadlineAfter(DEFAULT_TIMEOUT.getMillis(), TimeUnit.MILLISECONDS)
           .acknowledge(
               AcknowledgeRequest.newBuilder()

Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,7 @@ void sendAckOperations(`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`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)) {`
`191`	`188`	`stub.withDeadlineAfter(DEFAULT_TIMEOUT.getMillis(), TimeUnit.MILLISECONDS)`
`192`	`189`	`.acknowledge(`
`193`	`190`	`AcknowledgeRequest.newBuilder()`