From 3876bf72120b6a41d83e4da87e1301eb89c90a7b Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 23 Jul 2022 13:54:28 +0800
Subject: [PATCH] handle except

---
 source/libs/transport/src/transCli.c | 5 ++++-
 source/libs/transport/src/transSvr.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 2257458fc6..da59dc605f 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -196,7 +196,10 @@ static void cliReleaseUnfinishedMsg(SCliConn* conn) {
       CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle);                                                                  \
       transClearBuffer(&conn->readBuf);                                                                           \
       transFreeMsg(transContFromHead((char*)head));                                                               \
-      if (transQueueSize(&conn->cliMsgs) > 0 && ahandle == 0) return;                                             \
+      if (transQueueSize(&conn->cliMsgs) > 0 && ahandle == 0) {                                                   \
+        SCliMsg* cliMsg = transQueueGet(&conn->cliMsgs, 0);                                                       \
+        if (cliMsg->type == Release) return;                                                                      \
+      }                                                                                                           \
       tDebug("%s conn %p receive release request, ref:%d", CONN_GET_INST_LABEL(conn), conn, T_REF_VAL_GET(conn)); \
       if (T_REF_VAL_GET(conn) > 1) {                                                                              \
         transUnrefCliHandle(conn);                                                                                \
diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index 86f1c5df1e..ac14e22a51 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -397,11 +397,11 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
 
   if (pConn->status == ConnNormal) {
     pHead->msgType = (0 == pMsg->msgType ? pConn->inType + 1 : pMsg->msgType);
+    if (smsg->type == Release) pHead->msgType = 0;
   } else {
     if (smsg->type == Release) {
       pHead->msgType = 0;
       pConn->status = ConnNormal;
-
       destroyConnRegArg(pConn);
       transUnrefSrvHandle(pConn);
     } else {