support handle empty response content (#363)

* fix code style * support two way ssl validation * support handle empty response and upgrade version to 1.6.11-SNAPSHOT * format code * bugfix: donot deserializeContent when contentLength == 0 --------- Co-authored-by: linxin <[email protected]>
sofastack · Nov 27, 2024 · 8bcdae6 · 8bcdae6
1 parent 80bb0c9
commit 8bcdae6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa</groupId>
     <artifactId>bolt</artifactId>
-    <version>1.6.10</version>
+    <version>1.6.11-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoder.java b/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoder.java
@@ -161,7 +161,9 @@ public void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) thro
                                     header = new byte[headerLen];
                                     in.readBytes(header);
                                 }
-                                if (contentLen > 0) {
+                                if (contentLen == 0) {
+                                    content = new byte[0];
+                                } else if (contentLen > 0) {
                                     content = new byte[contentLen];
                                     in.readBytes(content);
                                 }

diff --git a/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java b/src/main/java/com/alipay/remoting/rpc/protocol/RpcCommandDecoderV2.java
@@ -201,7 +201,9 @@ public void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) thro
                                     header = new byte[headerLen];
                                     in.readBytes(header);
                                 }
-                                if (contentLen > 0) {
+                                if (contentLen == 0) {
+                                    content = new byte[0];
+                                } else if (contentLen > 0) {
                                     content = new byte[contentLen];
                                     in.readBytes(content);
                                 }

diff --git a/src/main/java/com/alipay/remoting/rpc/protocol/RpcResponseCommand.java b/src/main/java/com/alipay/remoting/rpc/protocol/RpcResponseCommand.java
@@ -130,7 +130,7 @@ public void deserializeContent(InvokeContext invokeContext) throws Deserializati
                     && this.getCustomSerializer().deserializeContent(this, invokeContext)) {
                     return;
                 }
-                if (this.getContent() != null) {
+                if (this.getContent() != null && this.getContentLength() > 0) {
                     this.setResponseObject(SerializerManager.getSerializer(this.getSerializer())
                         .deserialize(this.getContent(), this.responseClass));
                 }