This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new ee5ecc1 fix messageArrivingListener NPE
new ba74c49 Merge pull request #2815 from
BurningCN/fix_messageArrivingListener_npe
ee5ecc1 is described below
commit ee5ecc1335ca7e189431212037d2af24e6c38f51
Author: BurningCN <[email protected]>
AuthorDate: Fri Apr 16 10:20:11 2021 +0800
fix messageArrivingListener NPE
---
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
index 14a8848..b8ecdee 100644
--- 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(),
