---

davidtorres · davidtorres · commit 2f21e35d2c7c · 2016-12-19T17:02:36.000-05:00
yaml --- r: 5317 b: refs/heads/master c: 0d82897 h: refs/heads/master i: 5315: c5dde44
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: eb693bdf8ffe69b548efe91cb9e8a027898dfb19
+refs/heads/master: 0d82897a5bef7183c13e94065e50e11cc08e6071
 refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
 refs/heads/gh-pages: 229631582f8957646f81e92ae5a326504f48ee5b
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/AbstractSubscriberConnection.java b/trunk/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/trunk/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PollingSubscriberConnection.java b/trunk/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()`