From f4f38310cf836015ae0e0252b0abcc593ad974d8 Mon Sep 17 00:00:00 2001 From: slievrly Date: Thu, 18 Jan 2024 21:45:55 +0800 Subject: [PATCH 1/2] optimize: optimize ProtocolV1SerializerTest failed --- .../java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java index 6f99a8d2ba0..e5fc8cc2b82 100644 --- a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java +++ b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java @@ -71,8 +71,6 @@ public class ProtocolV1Decoder extends LengthFieldBasedFrameDecoder { public ProtocolV1Decoder() { // default is 8M this(ProtocolConstants.MAX_FRAME_LENGTH); - String serializerName = CONFIG.getConfig(ConfigurationKeys.SERIALIZE_FOR_RPC, SerializerType.SEATA.name()); - this.serializerType = SerializerType.getByName(serializerName); } public ProtocolV1Decoder(int maxFrameLength) { @@ -84,6 +82,8 @@ int lengthFieldLength, FullLength is int(4B). so values is 4 int initialBytesToStrip we will check magic code and version self, so do not strip any bytes. so values is 0 */ super(maxFrameLength, 3, 4, -7, 0); + String serializerName = CONFIG.getConfig(ConfigurationKeys.SERIALIZE_FOR_RPC, SerializerType.SEATA.name()); + this.serializerType = SerializerType.getByName(serializerName); } @Override From b2b9b7dccd51a17bf511ed7909f3dd4a12b08acc Mon Sep 17 00:00:00 2001 From: slievrly Date: Thu, 18 Jan 2024 21:50:23 +0800 Subject: [PATCH 2/2] optimize: optimize ProtocolV1SerializerTest failed --- changes/en-us/2.x.md | 3 ++- changes/zh-cn/2.x.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 5a6d78eedfe..506f4ebeae8 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -21,6 +21,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6261](https://github.com/apache/incubator-seata/pull/6261)] AT mode support the URL of a PGSQL cluster - [[#6256](https://github.com/apache/incubator-seata/pull/6256)] fix raft-discovery cannot read registry configuration for seata-all sdk - [[#6232](https://github.com/apache/incubator-seata/pull/6232)] convert to utf8mb4 if mysql column is json type +- [[#6278](https://github.com/apache/incubator-seata/pull/6278)] fix ProtocolV1SerializerTest failed ### optimize: @@ -65,7 +66,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6271](https://github.com/apache/incubator-seata/pull/6271)] unifty the git information - [[#6265](https://github.com/apache/incubator-seata/pull/6265)] optimization fails to build frontend on arm64 - [[#6267](https://github.com/apache/incubator-seata/pull/6267)] add Server deserialization validation -- - [[#6275](https://github.com/apache/incubator-seata/pull/6275)] optimize the label's format in .asf.yaml +- [[#6275](https://github.com/apache/incubator-seata/pull/6275)] optimize the label's format in .asf.yaml ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 1c3ba25546e..d72ba2972be 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -21,6 +21,7 @@ - [[#6261](https://github.com/apache/incubator-seata/pull/6261)] at模式支持pgsql集群模式url - [[#6256](https://github.com/apache/incubator-seata/pull/6256)] 修复在seata-all sdk下，raft-discovery模块不能读取registry.conf的配置的问题 - [[#6232](https://github.com/apache/incubator-seata/pull/6232)] 修复在mysql的json类型下出现Cannot create a JSON value from a string with CHARACTER SET 'binary'问题 +- [[#6278](https://github.com/apache/incubator-seata/pull/6278)] 修复 ProtocolV1SerializerTest 失败问题 ### optimize: - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] 添加undo_log表的存在性校验