From a98b3fbfccc681c70b57dba43c8e33437d1ba1bd Mon Sep 17 00:00:00 2001 From: yx9o Date: Tue, 10 Feb 2026 23:58:32 +0800 Subject: [PATCH] [ISSUE #10093] Enhance delayed message type validation in batch send --- .../java/org/apache/rocketmq/common/message/MessageBatch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/apache/rocketmq/common/message/MessageBatch.java b/common/src/main/java/org/apache/rocketmq/common/message/MessageBatch.java index 30369b8f372..448484300bf 100644 --- a/common/src/main/java/org/apache/rocketmq/common/message/MessageBatch.java +++ b/common/src/main/java/org/apache/rocketmq/common/message/MessageBatch.java @@ -45,8 +45,8 @@ public static MessageBatch generateFromList(Collection messag List messageList = new ArrayList<>(messages.size()); Message first = null; for (Message message : messages) { - if (message.getDelayTimeLevel() > 0) { - throw new UnsupportedOperationException("TimeDelayLevel is not supported for batching"); + if (message.getDelayTimeLevel() > 0 || message.getDelayTimeMs() > 0 || message.getDelayTimeSec() > 0 || message.getDeliverTimeMs() > 0) { + throw new UnsupportedOperationException("Delayed messages are not supported for batching"); } if (message.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) { throw new UnsupportedOperationException("Retry Group is not supported for batching");