Fix unboxing npe in SendMessageRequestHeader (apache#7873)

Jianing-Xu · Mar 1, 2024 · cb9ea9e · cb9ea9e
1 parent a33f1d1
commit cb9ea9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.../src/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeader.java b/.../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 void setProperties(String properties) {
     }
 
     public Integer getReconsumeTimes() {
+        if (null == reconsumeTimes) {
+            return 0;
+        }
         return reconsumeTimes;
     }
 
@@ -144,10 +147,13 @@ public void setReconsumeTimes(Integer reconsumeTimes) {
     }
 
     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 void setMaxReconsumeTimes(final Integer maxReconsumeTimes) {
     }
 
     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/...rc/main/java/org/apache/rocketmq/remoting/protocol/header/SendMessageRequestHeaderV2.java b/...rc/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