From 3879dcdf59ec126c0497b183dc15520472aab299 Mon Sep 17 00:00:00 2001 From: tigercl Date: Thu, 8 Nov 2018 23:02:35 +0800 Subject: [PATCH] Fix 'badarg' bug with duplicate subscriptions (#1943) --- src/emqx_broker.erl | 1 - src/emqx_sm.erl | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/emqx_broker.erl b/src/emqx_broker.erl index 857090c25..1a04cf997 100644 --- a/src/emqx_broker.erl +++ b/src/emqx_broker.erl @@ -337,7 +337,6 @@ handle_cast({From, #subscribe{topic = Topic, subpid = SubPid, subid = SubId, sub true -> case ets:lookup_element(?SUBOPTION, {Topic, Subscriber}, 2) =:= SubOpts of true -> - io:format("Ets: ~p, SubOpts: ~p", [ets:lookup_element(?SUBOPTION, Topic, Subscriber), SubOpts]), gen_server:reply(From, ok), {noreply, State}; false -> diff --git a/src/emqx_sm.erl b/src/emqx_sm.erl index bc3f6ff68..55d0e26a7 100644 --- a/src/emqx_sm.erl +++ b/src/emqx_sm.erl @@ -60,9 +60,7 @@ open_session(SessAttrs = #{clean_start := true, client_id := ClientId, conn_pid emqx_sm_locker:trans(ClientId, CleanStart); open_session(SessAttrs = #{clean_start := false, - client_id := ClientId, - max_inflight := MaxInflight, - topic_alias_maximum := TopicAliasMaximum}) -> + client_id := ClientId}) -> ResumeStart = fun(_) -> case resume_session(ClientId, SessAttrs) of {ok, SPid} ->