From 1da5ff2d32ccc4a75d5191690476af8e85356256 Mon Sep 17 00:00:00 2001
From: Michael Darakananda <pongad@google.com>
Date: Wed, 10 May 2017 12:08:28 +1000
Subject: [PATCH 1/2] pubsub: make Polling work with Long element count

---
 .../cloud/pubsub/spi/v1/PollingSubscriberConnection.java   | 7 +++++--
 pom.xml                                                    | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java
index 3ee825efff80..dfa43052cd2a 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java
@@ -23,6 +23,7 @@
 import com.google.cloud.pubsub.spi.v1.MessageDispatcher.AckProcessor;
 import com.google.cloud.pubsub.spi.v1.MessageDispatcher.PendingModifyAckDeadline;
 import com.google.common.collect.Lists;
+import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -70,7 +71,7 @@ public PollingSubscriberConnection(
       Distribution ackLatencyDistribution,
       Channel channel,
       FlowController flowController,
-      @Nullable Integer maxDesiredPulledMessages,
+      @Nullable Long maxDesiredPulledMessages,
       ScheduledExecutorService executor,
       @Nullable ScheduledExecutorService alarmsExecutor,
       ApiClock clock) {
@@ -90,7 +91,9 @@ public PollingSubscriberConnection(
             clock);
     messageDispatcher.setMessageDeadlineSeconds(Subscriber.MIN_ACK_DEADLINE_SECONDS);
     this.maxDesiredPulledMessages =
-        maxDesiredPulledMessages != null ? maxDesiredPulledMessages : DEFAULT_MAX_MESSAGES;
+        maxDesiredPulledMessages != null
+            ? Ints.saturatedCast(maxDesiredPulledMessages)
+            : DEFAULT_MAX_MESSAGES;
   }
 
   @Override
diff --git a/pom.xml b/pom.xml
index f5bf98c3b96a..5cdcbf38b492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,8 +130,8 @@
 
     <api-client.version>1.21.0</api-client.version>
     <api-common.version>1.0.0</api-common.version>
-    <gax.version>1.0.0</gax.version>
-    <gax-grpc.version>0.16.0</gax-grpc.version>
+    <gax.version>1.0.1</gax.version>
+    <gax-grpc.version>0.16.1</gax-grpc.version>
     <generatedProto.version>0.1.9</generatedProto.version>
     <google.auth.version>0.6.1</google.auth.version>
     <grpc.version>1.2.0</grpc.version>

From 822c7473e3ecd1abb378038a9487b2a4cfde9848 Mon Sep 17 00:00:00 2001
From: Michael Darakananda <pongad@google.com>
Date: Thu, 11 May 2017 10:29:12 +1000
Subject: [PATCH 2/2] use 1.1.0 and 0.17.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5cdcbf38b492..3abe9a892589 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,8 +130,8 @@
 
     <api-client.version>1.21.0</api-client.version>
     <api-common.version>1.0.0</api-common.version>
-    <gax.version>1.0.1</gax.version>
-    <gax-grpc.version>0.16.1</gax-grpc.version>
+    <gax.version>1.1.0</gax.version>
+    <gax-grpc.version>0.17.0</gax-grpc.version>
     <generatedProto.version>0.1.9</generatedProto.version>
     <google.auth.version>0.6.1</google.auth.version>
     <grpc.version>1.2.0</grpc.version>