Merge pull request #2815 from BurningCN/fix_messageArrivingListener_npe

[ISSUE #2816] fix messageArrivingListener NPE

Merge pull request #2815 from BurningCN/fix_messageArrivingListener_npe
[ISSUE #2816] fix messageArrivingListener NPE
ba74c497 · Heng Du · GitHub · 1fbccd14 · ee5ecc13 · ba74c497
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java ...n/java/org/apache/rocketmq/store/DefaultMessageStore.java +2 -1

未找到文件。
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -1947,7 +1947,8 @@ public class DefaultMessageStore implements MessageStore {
                                    DefaultMessageStore.this.doDispatch(dispatchRequest);
                                    if (BrokerRole.SLAVE != DefaultMessageStore.this.getMessageStoreConfig().getBrokerRole()
-                                        && DefaultMessageStore.this.brokerConfig.isLongPollingEnable()) {
+                                            && DefaultMessageStore.this.brokerConfig.isLongPollingEnable()
+                                            && DefaultMessageStore.this.messageArrivingListener != null) {
                                        DefaultMessageStore.this.messageArrivingListener.arriving(dispatchRequest.getTopic(),
                                            dispatchRequest.getQueueId(), dispatchRequest.getConsumeQueueOffset() + 1,
                                            dispatchRequest.getTagsCode(), dispatchRequest.getStoreTimestamp(),