Fix race condition in DefaultEventHandle (#3618)

Signed-off-by: Krishna Kondaka <[email protected]> Co-authored-by: Krishna Kondaka <[email protected]>
opensearch-project · Nov 9, 2023 · d3acfa7 · d3acfa7
1 parent 621de7b
commit d3acfa7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventHandle.java b/...-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventHandle.java
@@ -56,8 +56,10 @@ public Instant getExternalOriginationTime() {
 
     @Override
     public void release(boolean result) {
-        for (final BiConsumer<EventHandle, Boolean> consumer: releaseConsumers) {
-            consumer.accept(this, result);
+        synchronized (releaseConsumers) {
+            for (final BiConsumer<EventHandle, Boolean> consumer: releaseConsumers) {
+                consumer.accept(this, result);
+            }
         }
         AcknowledgementSet acknowledgementSet = getAcknowledgementSet();
         if (acknowledgementSet != null) {
@@ -67,6 +69,8 @@ public void release(boolean result) {
 
     @Override
     public void onRelease(BiConsumer<EventHandle, Boolean> releaseConsumer) {
-        releaseConsumers.add(releaseConsumer);
+        synchronized (releaseConsumers) {
+            releaseConsumers.add(releaseConsumer);
+        }
     }
 }