diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 12:53:50 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 12:53:50 +0100 |
commit | f7fcf6aac62c93f73a95aea0e37f5b040e645fda (patch) | |
tree | 6ed1d1a376e0de29dbc5cd20be9f89adfef58823 | |
parent | ca8d1adb86b533711f70a5483dba6f9ff829be85 (diff) | |
parent | 074d731e6e978855006aa6d924e568db98e9d775 (diff) | |
download | rabbitmq-server-f7fcf6aac62c93f73a95aea0e37f5b040e645fda.tar.gz |
merge stable into default
-rw-r--r-- | src/gm.erl | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -709,15 +709,16 @@ handle_info({'DOWN', MRef, process, _Pid, Reason}, _ -> View1 = group_to_view(record_dead_member_in_group( Member, GroupName, TxnFun)), - {Result, State1} = maybe_erase_aliases(State, View1), handle_callback_result( - {Result, - case alive_view_members(View1) of - [Self] -> State1 #state { - members_state = blank_member_state(), - confirms = purge_confirms(Confirms) }; - _ -> State1 - end}) + case alive_view_members(View1) of + [Self] -> + {Result, State1} = maybe_erase_aliases(State, View1), + {Result, State1 #state { + members_state = blank_member_state(), + confirms = purge_confirms(Confirms) }}; + _ -> + change_view(View1, State) + end) end. |