commit 5a8818b0711982b1190d366e35a28ff84cefcf1a
author hardyfish <85128645+hardyfish@users.noreply.github.com> Thu Feb 16 08:38:28 2023 +0800
committer GitHub <noreply@github.com> Thu Feb 16 08:38:28 2023 +0800
tree 5709a71ce061ac1e252f76dcc4208a1a9ed3c4f2
parent bf3344386b1ce7e9b9dfb46b8f25bc2ddb6c2afa

[ISSUE #6077] fix issues that messageStore could be null

broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java

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 a96aa04..15cf66f 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 @@
         }
         if (messageStore != null) {
             registerMessageStoreHook();
+            result = result && this.messageStore.load();
         }
 
-        result = result && this.messageStore.load();
-
         if (messageStoreConfig.isTimerWheelEnable()) {
             result = result && this.timerMessageStore.load();
         }