---

dpcollins-google · sduskis · commit b25e03d495de · 2019-03-04T14:55:56.000-05:00
yaml --- r: 20197 b: refs/heads/autosynth-redis c: 7b9807d h: refs/heads/master i: 20195: 997caa8
diff --git a/[refs] b/[refs]
@@ -136,7 +136,7 @@ refs/heads/autosynth-iot: f03bdd338a9056ca3b7ea6d9ca901649ba9aab78
 refs/heads/autosynth-kms: 2828edfe3d2c53dd6e71912eae8a53c87bf40c87
 refs/heads/autosynth-language: c3d990dd34d81e7e935041e7147fb9dd27f8a557
 refs/heads/autosynth-os-login: 092fdbed6d5317948f92b708e9f50dedd89fc666
-refs/heads/autosynth-redis: 7971d0b4e04147c77f1a118cbc5408f6eb90d500
+refs/heads/autosynth-redis: 7b9807d5d0a400c757b8905fee768be4c85eba25
 refs/heads/autosynth-scheduler: d97f8743ba965c7d5e492c8dc1f51d023104e260
 refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
 refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
diff --git a/branches/autosynth-redis/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-redis/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();
     }
   }
 
