From 701be9c756128ca538f62cf4199c5301792cce8b Mon Sep 17 00:00:00 2001
From: Nikita Shupletsov <nshuplet@amazon.com>
Date: Tue, 14 Jan 2025 12:29:19 -0800
Subject: [PATCH] [AMQ-8354] Fix the bug with resync on format exception.

---
 .../org/apache/activemq/replica/source/ReplicaSequencer.java  | 4 ----
 .../apache/activemq/replica/source/ReplicaSourceBroker.java   | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSequencer.java b/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSequencer.java
index bc15eec29e..c197b4faab 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSequencer.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSequencer.java
@@ -201,10 +201,6 @@ void initialize() throws Exception {
     }
 
     void deinitialize() throws Exception {
-        if (!initialized.get()) {
-            return;
-        }
-
         logger.info("de-initializing replica sequencer");
 
         if (ackTaskRunner != null) {
diff --git a/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSourceBroker.java b/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSourceBroker.java
index ba5484d9a4..85197fd752 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSourceBroker.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/replica/source/ReplicaSourceBroker.java
@@ -102,6 +102,9 @@ public void start(ReplicaRole role, boolean resync) throws Exception {
             replicaSequencer.initialize();
         } catch (ReplicaStorageFormatException e) {
             logger.warn("ReplicaSequenceStorage is in old format. Initiating the resyncronization.");
+            replicaSequencer.deinitialize();
+            removeReplicationQueues();
+            initQueueProvider();
             replicaResynchronizer.resynchronize(role, true);
             replicaSequencer.initialize();
         }