diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-08-05 21:09:52 +0300 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2016-08-05 21:09:52 +0300 |
| commit | c2ef55a0757cdaefdf60312f2c6f501b60d22d70 (patch) | |
| tree | 0d8d8333693fb63bbf1e7f2abbede3ff991863cb /src/ejabberd_c2s.erl | |
| parent | d969e917c6b5dec8f0da300439d6f4153ccb3ac3 (diff) | |
Cosmetic change: Set CSI state 'active' on resume
The CSI state is always set to 'active' when a stream management session
is resumed; so there's no need to apply the CSI state of the old c2s
process, first.
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 74b78512a..ddbe56023 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -2800,8 +2800,7 @@ handle_resume(StateData, Attrs) -> #xmlel{name = <<"r">>, attrs = [{<<"xmlns">>, AttrXmlns}], children = []}), - FlushedState = csi_flush_queue(NewState), - NewStateData = FlushedState#state{csi_state = active}, + NewStateData = csi_flush_queue(NewState), ?INFO_MSG("Resumed session for ~s", [jid:to_string(NewStateData#state.jid)]), {ok, NewStateData}; @@ -3048,13 +3047,13 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) -> pres_timestamp = OldStateData#state.pres_timestamp, privacy_list = OldStateData#state.privacy_list, aux_fields = OldStateData#state.aux_fields, - csi_state = OldStateData#state.csi_state, mgmt_xmlns = OldStateData#state.mgmt_xmlns, mgmt_queue = OldStateData#state.mgmt_queue, mgmt_timeout = OldStateData#state.mgmt_timeout, mgmt_stanzas_in = OldStateData#state.mgmt_stanzas_in, mgmt_stanzas_out = OldStateData#state.mgmt_stanzas_out, - mgmt_state = active}}; + mgmt_state = active, + csi_state = active}}; {error, Msg} -> {error, Msg}; _ -> |