diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 18:37:36 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 18:37:36 +0100 |
commit | d90d70371c5b5a9f54cb40bdcc3c48b34109bc34 (patch) | |
tree | 1983e7ab42cc48f60b00b8b1b6422ae996af7404 | |
parent | 074d731e6e978855006aa6d924e568db98e9d775 (diff) | |
parent | 2e865618ac8c764b9c1765f49bd058764015cf9b (diff) | |
download | rabbitmq-server-d90d70371c5b5a9f54cb40bdcc3c48b34109bc34.tar.gz |
merge bug26084 into stable
-rw-r--r-- | src/gm.erl | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -711,13 +711,12 @@ handle_info({'DOWN', MRef, process, _Pid, Reason}, Member, GroupName, TxnFun)), handle_callback_result( 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) + [Self] -> maybe_erase_aliases( + State #state { + members_state = blank_member_state(), + confirms = purge_confirms(Confirms) }, + View1); + _ -> change_view(View1, State) end) end. |