From ae770e1dd0ea38bbf7e4edc8694c9ec2ef944ef0 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 12 Oct 2024 19:20:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0' into
 enh/opt-transport

---
 source/libs/executor/src/exchangeoperator.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/libs/executor/src/exchangeoperator.c b/source/libs/executor/src/exchangeoperator.c
index 9766a39803..d92652d288 100644
--- a/source/libs/executor/src/exchangeoperator.c
+++ b/source/libs/executor/src/exchangeoperator.c
@@ -533,10 +533,9 @@ int32_t loadRemoteDataCallback(void* param, SDataBuf* pMsg, int32_t code) {
 
   int64_t* pRpcHandle = taosArrayGet(pExchangeInfo->pFetchRpcHandles, index);
   if (pRpcHandle != NULL) {
-    code = asyncFreeConnById(pExchangeInfo->pTransporter, *pRpcHandle);
-    if (code != 0) {
-      qError("failed to free rpc handle, code:%s, %p", tstrerror(code), pExchangeInfo);
-      code = 0;
+    int32_t ret = asyncFreeConnById(pExchangeInfo->pTransporter, *pRpcHandle);
+    if (ret != 0) {
+      qError("failed to free rpc handle, code:%s, %p", tstrerror(ret), pExchangeInfo);
     }
     *pRpcHandle = -1;
   }