Merge pull request #663 from TransFICC/bug/clean-up-resources-in-netw…

…ork-publication [Tom/Michael/Andrey] Close NetworkPublication::senderBpe
aeron-io · May 2, 2019 · 622127a · 622127a
2 parents 61f34f3 + 065f19b
commit 622127a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/aeron-driver/src/main/java/io/aeron/driver/DriverConductor.java b/aeron-driver/src/main/java/io/aeron/driver/DriverConductor.java
@@ -1034,8 +1034,6 @@ private NetworkPublication newNetworkPublication(
             tempBuffer, countersManager, registrationId, sessionId, streamId, channel);
         final UnsafeBufferPosition senderLimit = SenderLimit.allocate(
             tempBuffer, countersManager, registrationId, sessionId, streamId, channel);
-        final AtomicCounter senderBpe = SenderBpe.allocate(
-            tempBuffer, countersManager, registrationId, sessionId, streamId, channel);
 
         if (params.isReplay)
         {
@@ -1068,7 +1066,7 @@ private NetworkPublication newNetworkPublication(
             publisherLimit,
             senderPosition,
             senderLimit,
-            senderBpe,
+            SenderBpe.allocate(tempBuffer, countersManager, registrationId, sessionId, streamId, channel),
             sessionId,
             streamId,
             initialTermId,

diff --git a/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java b/aeron-driver/src/main/java/io/aeron/driver/NetworkPublication.java
@@ -246,6 +246,7 @@ public void close()
         publisherLimit.close();
         senderPosition.close();
         senderLimit.close();
+        senderBpe.close();
         for (final ReadablePosition position : spyPositions)
         {
             position.close();