Merge branch 'apache:master' into master

MatrixHB · Jun 29, 2021 · ccbac89 · ccbac89
2 parents 20b6c39 + 0cf3846
commit ccbac89
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java b/src/main/java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java
@@ -248,7 +248,9 @@ public void collectConsumerOffset() {
                 MessageModel messageModel = MessageModel.CLUSTERING;
                 try {
                     onlineConsumers = mqAdminExt.examineConsumerConnectionInfo(group);
-                    messageModel = onlineConsumers.getMessageModel();
+                    if (onlineConsumers.getMessageModel() != null) {
+                        messageModel = onlineConsumers.getMessageModel();
+                    }
                 } catch (InterruptedException | RemotingException ex) {
                     log.error(String.format("get topic's(%s) online consumers(%s) exception", topic, group), ex);
                 } catch (MQClientException ex) {