fix old version decode

Bughue · Jul 24, 2024 · 6719e60 · 6719e60
1 parent dda2b2f
commit 6719e60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/core/src/main/java/org/apache/seata/core/protocol/Version.java b/core/src/main/java/org/apache/seata/core/protocol/Version.java
@@ -88,8 +88,7 @@ public static String getChannelVersion(Channel c) {
     public static void checkVersion(String version) throws IncompatibleVersionException {
         long current = convertVersion(CURRENT);
         long clientVersion = convertVersion(version);
-        long divideVersion = convertVersion(VERSION_0_7_1);
-        if ((current > divideVersion && clientVersion < divideVersion) || (current < divideVersion && clientVersion > divideVersion)) {
+        if (current < clientVersion) {
             throw new IncompatibleVersionException("incompatible client version:" + version);
         }
     }

diff --git a/core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolDecoderV0.java b/core/src/main/java/org/apache/seata/core/rpc/netty/v0/ProtocolDecoderV0.java
@@ -144,22 +144,15 @@ public RpcMessage decodeFrame(ByteBuf in) {
 
     @Override
     protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
-        Object decoded;
         try {
-            decoded = super.decode(ctx, in);
-            if (decoded instanceof ByteBuf) {
-                ByteBuf frame = (ByteBuf)decoded;
-                try {
-                    return decodeFrame(frame);
-                } finally {
-                    frame.release();
-                }
+            if (in instanceof ByteBuf) {
+                return decodeFrame(in);
             }
         } catch (Exception exx) {
             LOGGER.error("Decode frame error, cause: {}", exx.getMessage());
             throw new DecodeException(exx);
         }
-        return decoded;
+        return in;
     }
 
 }