[Java] LogPublisher should clean up existing publication when a new o…

…ne is added if it has not been done when the election initialises.
real-logic · Nov 28, 2020 · 512cf8d · 512cf8d
1 parent d237a94
commit 512cf8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java
@@ -1253,7 +1253,6 @@ void onLoadClusterMembers(final int memberId, final int highMemberId, final Stri
 
     int addNewLogPublication()
     {
-        logPublisher.disconnect(ctx.countedErrorHandler());
         logAdapter.disconnect(ctx.countedErrorHandler());
 
         final ExclusivePublication publication = createLogPublication(recoveryPlan);
@@ -1330,7 +1329,6 @@ boolean hasReplayDestination()
 
     Subscription createAndRecordLogSubscriptionAsFollower(final String logChannel)
     {
-        logPublisher.disconnect(ctx.countedErrorHandler());
         logAdapter.disconnect(ctx.countedErrorHandler());
 
         final Subscription subscription = aeron.addSubscription(logChannel, ctx.logStreamId());

diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/LogPublisher.java b/aeron-cluster/src/main/java/io/aeron/cluster/LogPublisher.java
@@ -56,6 +56,10 @@ class LogPublisher
 
     void publication(final ExclusivePublication publication)
     {
+        if (null != this.publication)
+        {
+            this.publication.close();
+        }
         this.publication = publication;
     }