(rocketmq) branch develop updated: fix: validate message batch input (#10459)

[jinrongtong]

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

RongtongJin 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 8997e8cdf0 fix: validate message batch input (#10459)
8997e8cdf0 is described below

commit 8997e8cdf083b74635245aa14721b487e13a7d45
Author: LeiXiaoGao <2995484...@qq.com>
AuthorDate: Thu Jun 11 10:12:22 2026 +0800

    fix: validate message batch input (#10459)
---
 .../java/org/apache/rocketmq/common/message/MessageBatch.java  |  5 +++--
 .../test/java/org/apache/rocketmq/common/MessageBatchTest.java | 10 ++++++++++
 2 files changed, 13 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 448484300b..6d8c647235 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
@@ -40,8 +40,9 @@ public class MessageBatch extends Message implements 
Iterable<Message> {
     }
 
     public static MessageBatch generateFromList(Collection<? extends Message> 
messages) {
-        assert messages != null;
-        assert messages.size() > 0;
+        if (messages == null || messages.isEmpty()) {
+            throw new IllegalArgumentException("messages must not be null or 
empty");
+        }
         List<Message> messageList = new ArrayList<>(messages.size());
         Message first = null;
         for (Message message : messages) {
diff --git 
a/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java 
b/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java
index 5876cbdd88..c0eb908c51 100644
--- a/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java
@@ -41,6 +41,16 @@ public class MessageBatchTest {
         MessageBatch.generateFromList(messages);
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testGenerate_NullMessages() throws Exception {
+        MessageBatch.generateFromList(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGenerate_EmptyMessages() throws Exception {
+        MessageBatch.generateFromList(new ArrayList<>());
+    }
+
     @Test(expected = UnsupportedOperationException.class)
     public void testGenerate_DiffTopic() throws Exception {
         List<Message> messages = generateMessages();