[rocketmq] branch develop updated: map null exception

[du...@apache.org]

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 edf2ee00a map null exception
     new f751fc313 Merge pull request #4629 from fujian-zfj/develop-1
edf2ee00a is described below

commit edf2ee00a65e0fc2b8324aa7036a53dd817a0eca
Author: fujian.zfj <fu...@alibaba-inc.com>
AuthorDate: Mon Jul 18 17:36:35 2022 +0800

    map null exception
---
 store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java b/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
index 06c06e48b..587bddb56 100644
--- a/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
+++ b/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java
@@ -480,7 +480,7 @@ public class ConsumeQueue implements ConsumeQueueInterface, FileQueueLifeCycle {
             return false;
         }
         Map<String, String> prop = dispatchRequest.getPropertiesMap();
-        if (prop == null && prop.isEmpty()) {
+        if (prop == null || prop.isEmpty()) {
             return false;
         }
         String multiDispatchQueue = prop.get(MessageConst.PROPERTY_INNER_MULTI_DISPATCH);