1 files changed, 2 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
index 8d8b6dabce8..3c7b2148400 100644
--- a/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
+++ b/zookeeper-server/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java
@@ -597,7 +597,6 @@ public class Learner {
                     willSnapshot = false;          // but anything after this needs to go to the transaction log; or
                 }
 
-                self.setCurrentEpoch(newEpoch);
                 sock.setSoTimeout(self.tickTime * self.syncLimit);
                 self.setSyncMode(QuorumPeer.SyncMode.NONE);
                 zk.startupWithoutServing();
@@ -613,6 +612,8 @@ public class Learner {
                     delayedProposals.clear();
                     fzk.syncProcessor.syncFlush();
                 }
+
+                self.setCurrentEpoch(newEpoch);
             }
 
             void flushAcks() throws InterruptedException {