[rocketmq] branch develop updated: [ISSUE #7302] Fix singleTopicRegister code deleted in merge

[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 d67b9d64cb  [ISSUE #7302] Fix singleTopicRegister code deleted in merge
d67b9d64cb is described below

commit d67b9d64cbd53824798af57ba18770e0fcefa37a
Author: yuz10 <845238...@qq.com>
AuthorDate: Wed Sep 6 14:07:23 2023 +0800

     [ISSUE #7302] Fix singleTopicRegister code deleted in merge
---
 .../java/org/apache/rocketmq/broker/topic/TopicConfigManager.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java 
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
index 1c3b9711fd..4e3c1736c4 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -330,7 +330,11 @@ public class TopicConfigManager extends ConfigManager {
             log.error("createTopicIfAbsent ", e);
         }
         if (createNew && register) {
-            this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
+            if 
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+                this.brokerController.registerSingleTopicAll(topicConfig);
+            } else {
+                this.brokerController.registerIncrementBrokerData(topicConfig, 
dataVersion);
+            }
         }
         return getTopicConfig(topicConfig.getTopicName());
     }