[ISSUE apache#6627] Fix ConsumerLagCalculator#processAllGroup retry t…

…opic NPE
drpmma · Apr 21, 2023 · a1a4dbf · a1a4dbf
1 parent ea8b9d9
commit a1a4dbf
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/metrics/ConsumerLagCalculator.java b/broker/src/main/java/org/apache/rocketmq/broker/metrics/ConsumerLagCalculator.java
@@ -177,12 +177,14 @@ private void processAllGroup(Consumer<ProcessGroupInfo> consumer) {
                 if (isPop) {
                     String retryTopic = KeyBuilder.buildPopRetryTopic(topic, group);
                     TopicConfig retryTopicConfig = topicConfigManager.selectTopicConfig(retryTopic);
-                    int retryTopicPerm = retryTopicConfig.getPerm() & brokerConfig.getBrokerPermission();
-                    if (PermName.isReadable(retryTopicPerm) || PermName.isWriteable(retryTopicPerm)) {
-                        consumer.accept(new ProcessGroupInfo(group, topic, true, retryTopic));
-                    } else {
-                        consumer.accept(new ProcessGroupInfo(group, topic, true, null));
+                    if (retryTopicConfig != null) {
+                        int retryTopicPerm = retryTopicConfig.getPerm() & brokerConfig.getBrokerPermission();
+                        if (PermName.isReadable(retryTopicPerm) || PermName.isWriteable(retryTopicPerm)) {
+                            consumer.accept(new ProcessGroupInfo(group, topic, true, retryTopic));
+                            continue;
+                        }
                     }
+                    consumer.accept(new ProcessGroupInfo(group, topic, true, null);
                 } else {
                     consumer.accept(new ProcessGroupInfo(group, topic, false, null));
                 }