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

apache · Feb 16, 2023 · 5a8818b · 5a8818b
1 parent bf33443
commit 5a8818b
Showing 1 changed file with 1 addition and 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
@@ -770,10 +770,9 @@ public boolean initialize() throws CloneNotSupportedException {
         }
         if (messageStore != null) {
             registerMessageStoreHook();
+            result = result && this.messageStore.load();
         }
 
-        result = result && this.messageStore.load();
-
         if (messageStoreConfig.isTimerWheelEnable()) {
             result = result && this.timerMessageStore.load();
         }