[rocketmq] branch develop updated: [ISSUE #6092] fix: wrong brokerConfigPath when init configuration

[jinrongtong]

This is an automated email from the ASF dual-hosted git repository.

jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 076941407 [ISSUE #6092] fix: wrong brokerConfigPath when init 
configuration
076941407 is described below

commit 076941407a3556c658e7effcbd1ac6f522029248
Author: Lei Zhiyuan <leizhiy...@gmail.com>
AuthorDate: Tue Feb 21 14:49:16 2023 +0800

    [ISSUE #6092] fix: wrong brokerConfigPath when init configuration
    
    Co-authored-by: RongtongJin <jinrongton...@mails.ucas.ac.cn>
---
 .../src/main/java/org/apache/rocketmq/broker/BrokerController.java   | 5 +----
 1 file changed, 1 insertion(+), 4 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 15cf66f7a..edaac446f 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -41,7 +41,6 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.acl.AccessValidator;
 import org.apache.rocketmq.acl.plain.PlainAccessValidator;
@@ -357,9 +356,7 @@ public class BrokerController {
         if (brokerConfig.getBrokerConfigPath() != null && 
!brokerConfig.getBrokerConfigPath().isEmpty()) {
             brokerConfigPath = brokerConfig.getBrokerConfigPath();
         } else {
-            brokerConfigPath = FilenameUtils.concat(
-                
FilenameUtils.getFullPathNoEndSeparator(BrokerPathConfigHelper.getBrokerConfigPath()),
-                this.brokerConfig.getCanonicalName() + ".properties");
+            brokerConfigPath = BrokerPathConfigHelper.getBrokerConfigPath();
         }
         this.configuration = new Configuration(
             LOG,