---

dpcollins-google · sduskis · commit d968e70431c1 · 2019-03-04T14:55:56.000-05:00
yaml --- r: 19763 b: refs/heads/autosynth-iot c: 7b9807d h: refs/heads/master i: 19761: 1212026 19759: 0af42e1
diff --git a/[refs] b/[refs]
@@ -132,7 +132,7 @@ refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
 refs/heads/autosynth-dialogflow: 7dbc2c1ea714328ccfa4f33645045f017ff080e7
 refs/heads/autosynth-errorreporting: 1101a04e8be074802c35332d5fcf8297f61cae32
 refs/heads/autosynth-firestore: d1a44f9acc302750e37b008ecb9c1aa535cc94df
-refs/heads/autosynth-iot: 7971d0b4e04147c77f1a118cbc5408f6eb90d500
+refs/heads/autosynth-iot: 7b9807d5d0a400c757b8905fee768be4c85eba25
 refs/heads/autosynth-kms: 4fff8f3cf6c830f7706ac4ef272f036bb87fbaf8
 refs/heads/autosynth-language: 6262e2eb76944f01972c887b3e684aaf65ec999a
 refs/heads/autosynth-os-login: a88a337797996a205873040a63abe1d3116f5789
diff --git a/branches/autosynth-iot/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-iot/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();
     }
   }
 
