---

dpcollins-google · sduskis · commit 93565b58ccca · 2019-03-04T10:50:40.000-05:00
yaml --- r: 18939 b: refs/heads/autosynth-vision c: 5e0acc0 h: refs/heads/master i: 18937: 4a5c5d0 18935: 7058ec0
diff --git a/[refs] b/[refs]
@@ -117,7 +117,7 @@ refs/heads/autosynth-container: f6384095f50b31bfc8208542a49181e158d3681c
 refs/heads/autosynth-monitoring: 832528c131ac32b115fd7a369701d9e6e4ec62e5
 refs/heads/autosynth-pubsub: 7a327eaed5fb2a5d6c1691feb73c3e0194dd805e
 refs/heads/autosynth-video-intelligence: 53ca56e5d077bf67065b730f3fe621f40689fb4c
-refs/heads/autosynth-vision: 4517817a110e3d5230f63ccff810c0644cfab78a
+refs/heads/autosynth-vision: 5e0acc0913b8608dd896a9e8da1241b8bc251a1d
 refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
 refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
 refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
diff --git a/branches/autosynth-vision/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-vision/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
@@ -371,41 +371,31 @@ public void processReceivedMessages(List<ReceivedMessage> messages, Runnable don
     processOutstandingBatches();
   }
 
-  public void processOutstandingBatches() {
-    while (true) {
-      boolean batchDone = false;
-      Runnable batchCallback = null;
-      OutstandingMessage outstandingMessage;
-      synchronized (outstandingMessageBatches) {
-        OutstandingMessageBatch nextBatch = outstandingMessageBatches.peek();
-        if (nextBatch == null) {
-          return;
-        }
-        outstandingMessage = nextBatch.messages.peek();
-        if (outstandingMessage == null) {
-          return;
-        }
-        try {
-          // This is a non-blocking flow controller.
-          flowController.reserve(
-              1, outstandingMessage.receivedMessage().getMessage().getSerializedSize());
-        } catch (FlowController.MaxOutstandingElementCountReachedException
-            | FlowController.MaxOutstandingRequestBytesReachedException flowControlException) {
-          return;
-        } catch (FlowControlException unexpectedException) {
-          throw new IllegalStateException("Flow control unexpected exception", unexpectedException);
-        }
-        nextBatch.messages.poll(); // We got a hold to the message already.
-        batchDone = nextBatch.messages.isEmpty();
-        if (batchDone) {
-          outstandingMessageBatches.poll();
-          batchCallback = nextBatch.doneCallback;
+  private void processOutstandingBatches() {
+    synchronized (outstandingMessageBatches) {
+      for (OutstandingMessageBatch nextBatch = outstandingMessageBatches.poll();
+          nextBatch != null;
+          nextBatch = outstandingMessageBatches.poll()) {
+        for (OutstandingMessage nextMessage = nextBatch.messages.poll();
+            nextMessage != null;
+            nextMessage = nextBatch.messages.poll()) {
+          try {
+            // This is a non-blocking flow controller.
+            flowController.reserve(1, nextMessage.receivedMessage.getMessage().getSerializedSize());
+          } catch (FlowController.MaxOutstandingElementCountReachedException
+              | FlowController.MaxOutstandingRequestBytesReachedException flowControlException) {
+            // Unwind previous changes in the batches outstanding.
+            nextBatch.messages.addFirst(nextMessage);
+            outstandingMessageBatches.addFirst(nextBatch);
+            return;
+          } catch (FlowControlException unexpectedException) {
+            throw new IllegalStateException(
+                "Flow control unexpected exception", unexpectedException);
+          }
+          processOutstandingMessage(
+              nextMessage.receivedMessage.getMessage(), nextMessage.ackHandler);
         }
-      }
-      processOutstandingMessage(
-          outstandingMessage.receivedMessage.getMessage(), outstandingMessage.ackHandler);
-      if (batchDone) {
-        batchCallback.run();
+        nextBatch.doneCallback.run();
       }
     }
   }
