---

dpcollins-google · sduskis · commit 04b53f2cbe03 · 2019-03-04T14:55:56.000-05:00
yaml --- r: 18941 b: refs/heads/autosynth-vision c: 7b9807d h: refs/heads/master i: 18939: 93565b5
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: 7971d0b4e04147c77f1a118cbc5408f6eb90d500
+refs/heads/autosynth-vision: 7b9807d5d0a400c757b8905fee768be4c85eba25
 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
@@ -365,38 +365,32 @@ public void processReceivedMessages(List<ReceivedMessage> messages, Runnable don
     }
 
     messagesWaiter.incrementPendingMessages(outstandingBatch.messages.size());
-    synchronized (outstandingMessageBatches) {
-      outstandingMessageBatches.add(outstandingBatch);
-    }
+    outstandingMessageBatches.add(outstandingBatch);
     processOutstandingBatches();
   }
 
   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);
+    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);
         }
-        nextBatch.doneCallback.run();
+        processOutstandingMessage(nextMessage.receivedMessage.getMessage(), nextMessage.ackHandler);
       }
+      nextBatch.doneCallback.run();
     }
   }
 
