From 8cb12a96d948503a3c07f21db7eb0598ab03771b Mon Sep 17 00:00:00 2001
From: Yonny Hao <popduke@gmail.com>
Date: Sat, 14 Sep 2024 14:46:48 +0800
Subject: [PATCH] git rid of NPE during store closing

---
 .github/workflows/build-cov.yaml                              | 4 ++--
 .../java/com/baidu/bifromq/basekv/store/KVRangeStore.java     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-cov.yaml b/.github/workflows/build-cov.yaml
index 9fae2187b..d9474a226 100644
--- a/.github/workflows/build-cov.yaml
+++ b/.github/workflows/build-cov.yaml
@@ -11,9 +11,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java b/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java
index a73e26a03..868e9d75f 100644
--- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java
+++ b/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java
@@ -351,6 +351,9 @@ private void receive(StoreMessage storeMessage) {
             if (payload.hasEnsureRange()) {
                 EnsureRange request = storeMessage.getPayload().getEnsureRange();
                 mgmtTaskRunner.add(() -> {
+                    if (status.get() != Status.STARTED) {
+                        return CompletableFuture.completedFuture(null);
+                    }
                     KVRangeId rangeId = payload.getRangeId();
                     IKVRangeFSM range = kvRangeMap.get(rangeId);
                     try {