[ISSUES alibaba#8635] fix a NPE when call the shutdown method (alibab…

…a#8636) * [ISSUES alibaba#8635] fix a NPE when call the shutdown method Close alibaba#8635 * [ISSUES alibaba#8635] remove init judgment
onewe · Jun 28, 2022 · 56ee220 · 56ee220
1 parent ccce9da
commit 56ee220
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java b/naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
@@ -469,10 +469,16 @@ public void shutdown() throws NacosException {
         Loggers.RAFT.warn("start to close old raft protocol!!!");
         Loggers.RAFT.warn("stop old raft protocol task for notifier");
         NotifyCenter.deregisterSubscriber(notifier);
-        Loggers.RAFT.warn("stop old raft protocol task for master task");
-        masterTask.cancel(true);
-        Loggers.RAFT.warn("stop old raft protocol task for heartbeat task");
-        heartbeatTask.cancel(true);
+        if (masterTask != null) {
+            Loggers.RAFT.warn("stop old raft protocol task for master task");
+            masterTask.cancel(true);
+        }
+
+        if (heartbeatTask != null) {
+            Loggers.RAFT.warn("stop old raft protocol task for heartbeat task");
+            heartbeatTask.cancel(true);
+        }
+
         Loggers.RAFT.warn("clean old cache datum for old raft");
         datums.clear();
     }