(rocketmq) branch develop updated: Fix unboxing npe in SendMessageRequestHeader (#7873)

[zhouxzhan]

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

zhouxzhan 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 cb9ea9efb3 Fix unboxing npe in SendMessageRequestHeader (#7873)
cb9ea9efb3 is described below

commit cb9ea9efb379c7658f83078e6f7f6be580455ce8
Author: Zhouxiang Zhan <zhouxiang....@alibaba-inc.com>
AuthorDate: Fri Mar 1 11:11:19 2024 +0800

    Fix unboxing npe in SendMessageRequestHeader (#7873)
---
 .../protocol/header/SendMessageRequestHeader.java       | 17 +++++++++++++----
 .../protocol/header/SendMessageRequestHeaderV2.java     |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git 
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeader.java
 
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeader.java
index 17ce512631..2efc94220d 100644
--- 
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeader.java
+++ 
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeader.java
@@ -50,9 +50,9 @@ public class SendMessageRequestHeader extends 
TopicQueueRequestHeader {
     @CFNullable
     private Integer reconsumeTimes;
     @CFNullable
-    private boolean unitMode = false;
+    private Boolean unitMode;
     @CFNullable
-    private boolean batch = false;
+    private Boolean batch;
     private Integer maxReconsumeTimes;
 
     @Override
@@ -136,6 +136,9 @@ public class SendMessageRequestHeader extends 
TopicQueueRequestHeader {
     }
 
     public Integer getReconsumeTimes() {
+        if (null == reconsumeTimes) {
+            return 0;
+        }
         return reconsumeTimes;
     }
 
@@ -144,10 +147,13 @@ public class SendMessageRequestHeader extends 
TopicQueueRequestHeader {
     }
 
     public boolean isUnitMode() {
+        if (null == unitMode) {
+            return false;
+        }
         return unitMode;
     }
 
-    public void setUnitMode(boolean isUnitMode) {
+    public void setUnitMode(Boolean isUnitMode) {
         this.unitMode = isUnitMode;
     }
 
@@ -160,10 +166,13 @@ public class SendMessageRequestHeader extends 
TopicQueueRequestHeader {
     }
 
     public boolean isBatch() {
+        if (null == batch) {
+            return false;
+        }
         return batch;
     }
 
-    public void setBatch(boolean batch) {
+    public void setBatch(Boolean batch) {
         this.batch = batch;
     }
 
diff --git 
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeaderV2.java
 
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeaderV2.java
index 4b0d795bcd..7a49722e92 100644
--- 
a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeaderV2.java
+++ 
b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeaderV2.java
@@ -52,7 +52,7 @@ public class SendMessageRequestHeaderV2 extends 
TopicQueueRequestHeader implemen
     @CFNullable
     private Integer j; // reconsumeTimes;
     @CFNullable
-    private Boolean k; // unitMode = false;
+    private Boolean k; // unitMode;
 
     private Integer l; // consumeRetryTimes