From fe5b4a67ec69baeaad46b77a33764a03e6a8621b Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 6 May 2020 10:15:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E5=AD=98=E8=B6=8A?= =?UTF-8?q?=E7=95=8C=E9=97=AE=E9=A2=98RemoveRequest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/wsproxy/mastersvrmgr.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/wsproxy/mastersvrmgr.cc b/server/wsproxy/mastersvrmgr.cc index 7eb5521..e7b63ea 100644 --- a/server/wsproxy/mastersvrmgr.cc +++ b/server/wsproxy/mastersvrmgr.cc @@ -45,7 +45,6 @@ void MasterSvrMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr& hdr, const ss::SS_MS_ { f8::MsgHdr* context_hdr = GetHdrByContextId(msg.context_id()); if (context_hdr) { - bool auto_free = true; int socket_handle = context_hdr->socket_handle; if (msg.error_code() == 0) { TargetConn* conn = TargetConnMgr::Instance()->RecreateTargetConn( @@ -54,11 +53,12 @@ void MasterSvrMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr& hdr, const ss::SS_MS_ ); assert(conn); if (conn) { - auto_free = false; + RemoveRequest(socket_handle, msg.context_id(), false); conn->ForwardClientMsgEx(context_hdr); + return; } } - RemoveRequest(socket_handle, msg.context_id(), auto_free); + RemoveRequest(socket_handle, msg.context_id(), true); } }