summaryrefslogtreecommitdiff
path: root/src/ejabberd_c2s.erl
diff options
context:
space:
mode:
authorEvgeny Khramtsov <xramtsov@gmail.com>2014-05-27 15:34:34 +0400
committerEvgeny Khramtsov <xramtsov@gmail.com>2014-05-27 15:34:34 +0400
commit402fb9665dd16a4e35ebf42f7ab3a4b93068e589 (patch)
tree33b1c176134b44d3fa6935ef14da1005edbbb593 /src/ejabberd_c2s.erl
parentMerge pull request #218 from weiss/omit-iq-xmlns (diff)
parentXEP-0198: Cosmetic change: Omit redundant guard (diff)
Merge pull request #221 from weiss/omit-redundant-guard
XEP-0198: Cosmetic change: Omit redundant guard
Diffstat (limited to 'src/ejabberd_c2s.erl')
-rw-r--r--src/ejabberd_c2s.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 14bd4fb7..fd3e5886 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1170,8 +1170,7 @@ session_established({xmlstreamerror, _}, StateData) ->
{stop, normal, StateData};
session_established(closed, StateData)
when StateData#state.mgmt_timeout > 0,
- StateData#state.mgmt_state == active orelse
- StateData#state.mgmt_state == pending ->
+ StateData#state.mgmt_state == active ->
log_pending_state(StateData),
fsm_next_state(wait_for_resume, StateData#state{mgmt_state = pending});
session_established(closed, StateData) ->