From 5a8818b0711982b1190d366e35a28ff84cefcf1a Mon Sep 17 00:00:00 2001
From: hardyfish <85128645+hardyfish@users.noreply.github.com>
Date: Thu, 16 Feb 2023 08:38:28 +0800
Subject: [PATCH] [ISSUE #6077] fix issues that messageStore could be null

---
 .../main/java/org/apache/rocketmq/broker/BrokerController.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index a96aa04054..15cf66f7a5 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -770,10 +770,9 @@ public class BrokerController {
         }
         if (messageStore != null) {
             registerMessageStoreHook();
+            result = result && this.messageStore.load();
         }
 
-        result = result && this.messageStore.load();
-
         if (messageStoreConfig.isTimerWheelEnable()) {
             result = result && this.timerMessageStore.load();
         }