提交 33aee586 编写于 作者: Z zhangxu16

Merge branch 'master' of github.com:apache/rocketmq

...@@ -320,7 +320,7 @@ public class TopicConfigManager extends ConfigManager { ...@@ -320,7 +320,7 @@ public class TopicConfigManager extends ConfigManager {
topicConfig.setTopicSysFlag(TopicSysFlag.clearUnitFlag(oldTopicSysFlag)); topicConfig.setTopicSysFlag(TopicSysFlag.clearUnitFlag(oldTopicSysFlag));
} }
log.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag", oldTopicSysFlag, log.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag={}", oldTopicSysFlag,
topicConfig.getTopicSysFlag()); topicConfig.getTopicSysFlag());
this.topicConfigTable.put(topic, topicConfig); this.topicConfigTable.put(topic, topicConfig);
...@@ -338,9 +338,11 @@ public class TopicConfigManager extends ConfigManager { ...@@ -338,9 +338,11 @@ public class TopicConfigManager extends ConfigManager {
int oldTopicSysFlag = topicConfig.getTopicSysFlag(); int oldTopicSysFlag = topicConfig.getTopicSysFlag();
if (hasUnitSub) { if (hasUnitSub) {
topicConfig.setTopicSysFlag(TopicSysFlag.setUnitSubFlag(oldTopicSysFlag)); topicConfig.setTopicSysFlag(TopicSysFlag.setUnitSubFlag(oldTopicSysFlag));
} else {
topicConfig.setTopicSysFlag(TopicSysFlag.clearUnitSubFlag(oldTopicSysFlag));
} }
log.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag", oldTopicSysFlag, log.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag={}", oldTopicSysFlag,
topicConfig.getTopicSysFlag()); topicConfig.getTopicSysFlag());
this.topicConfigTable.put(topic, topicConfig); this.topicConfigTable.put(topic, topicConfig);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册