From 5cae8a590aedfef22fb4daa789196a09a44659ac Mon Sep 17 00:00:00 2001
From: Kirill Tkalenko <tkalkirill@yandex.ru>
Date: Mon, 13 Nov 2023 13:15:05 +0300
Subject: [PATCH] (fix) NullPointerException at FSMCallerImpl#doCommitted when
 this.node.getOptions() #1035 (#1036)

* (fix) NullPointerException at FSMCallerImpl#doCommitted when this.node.getOptions() #1035

* stylo
---
 .../src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java
index e502458f1..bd63a1f8e 100644
--- a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java
+++ b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java
@@ -233,7 +233,6 @@ public synchronized void shutdown() {
                 task.shutdownLatch = latch;
             }));
         }
-        doShutdown();
     }
 
     @Override
@@ -450,6 +449,7 @@ private long runApplyTask(final ApplyTask task, long maxCommittedIndex, final bo
                     case SHUTDOWN:
                         this.currTask = TaskType.SHUTDOWN;
                         shutdown = task.shutdownLatch;
+                        doShutdown();
                         break;
                     case FLUSH:
                         this.currTask = TaskType.FLUSH;