[rocketmq-exporter] branch master updated: Fix npe when messageModel return null

[tigerlee]

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

tigerlee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-exporter.git


The following commit(s) were added to refs/heads/master by this push:
     new 505e7e5  Fix npe when messageModel return null
     new 0cf3846  Merge pull request #54 from 
maixiaohai/fix_get_group_diff_metrics_npe
505e7e5 is described below

commit 505e7e5ade895e50febacd4d65e454ac82f9ca9c
Author: zhangxu16 <zhangx...@xiaomi.com>
AuthorDate: Thu Apr 8 20:09:22 2021 +0800

    Fix npe when messageModel return null
---
 .../java/org/apache/rocketmq/exporter/task/MetricsCollectTask.java    | 4 +++-
 1 file changed, 3 insertions(+), 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
index 09665c2..193d064 100644
--- 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 class MetricsCollectTask {
                 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) {