This is an automated email from the ASF dual-hosted git repository. jinrongtong pushed a commit to branch develop-merge-5.0.0 in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2a9113686c5c2c81ad848942a2b630b80053eaa1 Author: RongtongJin <[email protected]> AuthorDate: Fri Jul 8 18:55:39 2022 +0800 Make broker can start normally even if the configuration file is not set --- broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java index ca388b6cf..b9d19e283 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerStartup.java @@ -120,10 +120,10 @@ public class BrokerStartup { configFileHelper.setFile(file); configFile = file; BrokerPathConfigHelper.setBrokerConfigPath(file); + properties = configFileHelper.loadConfig(); } } - properties = configFileHelper.loadConfig(); if (properties != null) { properties2SystemEnv(properties); MixAll.properties2Object(properties, brokerConfig);
