Skip to content

Commit 76cd389

Browse files
authored
[ISSUE #10093] Enhance delayed message type validation in batch send (#10094)
1 parent a6be1ee commit 76cd389

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

common/src/main/java/org/apache/rocketmq/common/message/MessageBatch.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public static MessageBatch generateFromList(Collection<? extends Message> messag
4545
List<Message> messageList = new ArrayList<>(messages.size());
4646
Message first = null;
4747
for (Message message : messages) {
48-
if (message.getDelayTimeLevel() > 0) {
49-
throw new UnsupportedOperationException("TimeDelayLevel is not supported for batching");
48+
if (message.getDelayTimeLevel() > 0 || message.getDelayTimeMs() > 0 || message.getDelayTimeSec() > 0 || message.getDeliverTimeMs() > 0) {
49+
throw new UnsupportedOperationException("Delayed messages are not supported for batching");
5050
}
5151
if (message.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
5252
throw new UnsupportedOperationException("Retry Group is not supported for batching");

0 commit comments

Comments
 (0)