This is an automated email from the ASF dual-hosted git repository. yukon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-remoting.git
commit e39be6bf7b7643dd58dd3e50281de8c4dcb19a04 Author: yukon <[email protected]> AuthorDate: Fri May 17 16:39:49 2019 +0800 Fix codec bug: miss props len when no prop set --- .../rocketmq/remoting/{impl/netty => }/RemotingBootstrapFactory.java | 0 .../java/org/apache/rocketmq/remoting/impl/command/CodecHelper.java | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/netty/RemotingBootstrapFactory.java b/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/RemotingBootstrapFactory.java similarity index 100% rename from remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/netty/RemotingBootstrapFactory.java rename to remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/RemotingBootstrapFactory.java diff --git a/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/command/CodecHelper.java b/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/command/CodecHelper.java index df88504..41a5595 100644 --- a/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/command/CodecHelper.java +++ b/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/command/CodecHelper.java @@ -100,12 +100,14 @@ public class CodecHelper { out.writeBytes(remark); } - if (propsLen != 0) { + if (props != null) { out.writeShort((short) props.length); for (byte[] prop : props) { out.writeShort((short) prop.length); out.writeBytes(prop); } + } else { + out.writeShort((short) 0); } out.writeInt(payloadLen);
