提交 3c82cae1 编写于 作者: dengyihao's avatar dengyihao

merge trans

上级 28c930f9
......@@ -265,7 +265,7 @@ _RETURN:
void cliHandleExcept(SCliConn* pConn) {
if (transQueueEmpty(&pConn->cliMsgs)) {
if (pConn->broken == true || CONN_NO_PERSIST_BY_APP(pConn)) {
if (pConn->broken == true && CONN_NO_PERSIST_BY_APP(pConn)) {
transUnrefCliHandle(pConn);
return;
}
......
......@@ -291,7 +291,11 @@ void uvOnSendCb(uv_write_t* req, int status) {
memset(&conn->regArg, 0, sizeof(conn->regArg));
}
transQueuePop(&conn->srvMsgs);
free(msg);
tfree(msg);
msg = (SSrvMsg*)transQueuePop(&conn->srvMsgs);
if (msg != NULL) {
uvStartSendRespInternal(msg);
}
} else {
uvStartSendRespInternal(msg);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册