Cleaning up messageBatch entries

sduskis · sduskis · commit 8573e5a3d390 · 2019-04-30T22:16:28.000-04:00
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -240,6 +240,9 @@ public ApiFuture<String> publish(PubsubMessage message) {
       }
 
       batchesToSend = messagesBatch.add(outstandingPublish);
+      if (!batchesToSend.isEmpty() && messagesBatch.isEmpty()) {
+        messagesBatches.remove(orderingKey);
+      }
       setupAlarm();
     } finally {
       messagesBatchLock.unlock();

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,9 @@ public ApiFuture<String> publish(PubsubMessage message) {`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`batchesToSend = messagesBatch.add(outstandingPublish);`
	`243`	`+ if (!batchesToSend.isEmpty() && messagesBatch.isEmpty()) {`
	`244`	`+ messagesBatches.remove(orderingKey);`
	`245`	`+ }`
`243`	`246`	`setupAlarm();`
`244`	`247`	`} finally {`
`245`	`248`	`messagesBatchLock.unlock();`