yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: conflicts between main-v4.3 and main-v4.4

This commit is contained in:
Shawn 2022-05-23 11:42:33 +08:00
parent ca842aa869 b1d642bd6a
commit b330f0f2a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqx_session.erl
View File

@ -496,7 +496,7 @@ deliver_msg(ClientInfo, Msg = #message{qos = QoS}, Session =
%% This ack header is required for redispatch-on-terminate feature to work %% This ack header is required for redispatch-on-terminate feature to work
Publish = {PacketId, maybe_ack(Msg)}, Publish = {PacketId, maybe_ack(Msg)},
Msg2 = mark_begin_deliver(Msg), Msg2 = mark_begin_deliver(Msg),
Inflight1 = emqx_inflight:insert(PacketId, with_ts(Msg), Inflight), Inflight1 = emqx_inflight:insert(PacketId, with_ts(Msg2), Inflight),
{ok, [Publish], next_pkt_id(Session#session{inflight = Inflight1})} {ok, [Publish], next_pkt_id(Session#session{inflight = Inflight1})}
end. end.