(rocketmq) branch develop updated: [ISSUE ##7719] Add more property check for dealy message when auto-batch chack (#7720)

[jinrongtong]

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

jinrongtong 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 6fce427e10 [ISSUE ##7719] Add more property check for dealy message 
when auto-batch chack (#7720)
6fce427e10 is described below

commit 6fce427e109d905530b17e64aa5dc9bc19795c5d
Author: zzl <87265072+zhilia...@users.noreply.github.com>
AuthorDate: Thu Jan 4 17:38:03 2024 +0800

    [ISSUE ##7719] Add more property check for dealy message when auto-batch 
chack (#7720)
---
 .../java/org/apache/rocketmq/client/producer/DefaultMQProducer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
 
b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
index 700e00aac1..73a1251539 100644
--- 
a/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
+++ 
b/client/src/main/java/org/apache/rocketmq/client/producer/DefaultMQProducer.java
@@ -410,7 +410,7 @@ public class DefaultMQProducer extends ClientConfig 
implements MQProducer {
             return false;
         }
         // delay message do not support batch processing
-        if (msg.getDelayTimeLevel() > 0) {
+        if (msg.getDelayTimeLevel() > 0 || msg.getDelayTimeMs() > 0 || 
msg.getDelayTimeSec() > 0 || msg.getDeliverTimeMs() > 0) {
             return false;
         }
         // retry message do not support batch processing