remove leaked counters when they are closed to avoid memory leak

artiofix · Jun 4, 2020 · 37bde1a · 37bde1a
1 parent b9014b6
commit 37bde1a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/artio-core/src/main/java/uk/co/real_logic/artio/FixCounters.java b/artio-core/src/main/java/uk/co/real_logic/artio/FixCounters.java
@@ -20,8 +20,8 @@
 import org.agrona.concurrent.status.AtomicCounter;
 import uk.co.real_logic.artio.dictionary.generation.Exceptions;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class FixCounters implements AutoCloseable
 {
@@ -51,7 +51,7 @@ public int id()
         }
     }
 
-    private final List<Counter> counters = new ArrayList<>();
+    private final List<Counter> counters = new CopyOnWriteArrayList<>();
     private final AtomicCounter failedInboundPublications;
     private final AtomicCounter failedOutboundPublications;
     private final AtomicCounter failedReplayPublications;
@@ -60,6 +60,8 @@ public int id()
     FixCounters(final Aeron aeron)
     {
         this.aeron = aeron;
+        aeron.addUnavailableCounterHandler((countersReader, registrationId, counterId) ->
+            counters.removeIf(counter -> counter.id() == counterId));
         failedInboundPublications = newCounter(FixCountersId.FAILED_INBOUND_TYPE_ID.id(),
                 "Failed offer to inbound publication");
         failedOutboundPublications = newCounter(FixCountersId.FAILED_OUTBOUND_TYPE_ID.id(),