From 54dac30a3af6a702a9c95f36e8dff86ebff2eece Mon Sep 17 00:00:00 2001
From: zyxxoo <1318247699@qq.com>
Date: Tue, 16 Aug 2022 09:22:04 +0800
Subject: [PATCH] improve code

---
 .../src/main/java/com/baidu/hugegraph/election/MetaData.java | 2 +-
 .../java/com/baidu/hugegraph/election/MetaDataAdapter.java   | 1 +
 .../hugegraph/election/RoleElectionStateMachineImpl.java     | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaData.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaData.java
index 684c2fb120..845971f0ce 100644
--- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaData.java
+++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaData.java
@@ -15,7 +15,7 @@ public MetaData(String node, int epoch) {
     }
 
     public void increaseCount() {
-        this.count ++;
+        this.count++;
     }
 
     public boolean isMaster(String node) {
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaDataAdapter.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaDataAdapter.java
index c879c1f6df..196183bb76 100644
--- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaDataAdapter.java
+++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/MetaDataAdapter.java
@@ -3,6 +3,7 @@
 import java.util.Optional;
 
 public interface MetaDataAdapter {
+
     boolean postDelyIfPresent(MetaData metaData, long delySecond);
 
     Optional<MetaData> queryDelay(long delySecond);
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java
index b8d96026b1..8d2b4f9c18 100644
--- a/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java
+++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/election/RoleElectionStateMachineImpl.java
@@ -5,7 +5,7 @@
 
 import com.baidu.hugegraph.util.E;
 
-public class RoleElectionStateMachineImpl implements RoleElectionStateMachine{
+public class RoleElectionStateMachineImpl implements RoleElectionStateMachine {
 
     private volatile boolean shutdown = false;
     private Config config;
@@ -189,9 +189,10 @@ public void merge(WorkerState state) {
                 throw new IllegalStateException("Meta count must increase");
             } else if (state.metaData.epoch() == this.metaData.epoch() &&
                        state.metaData.count() > this.metaData.count()) {
+                this.count = 0;
                 this.metaData = state.metaData;
             } else {
-                this.count ++;
+                this.count++;
             }
         }
     }