summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-04-24 13:23:17 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-04-24 13:23:17 +0100
commit7fe75bcbb7f49d8779fd07ce1b0999ead02c0457 (patch)
treee9c4ee585df222da209cebd1c3ba88d9aa245f13
parentaf240609644b7c3df17a313232d68c127e2787c6 (diff)
parent0da58fd7cbfab33ae35ed07bc039a04c69c6329f (diff)
downloadrabbitmq-server-git-7fe75bcbb7f49d8779fd07ce1b0999ead02c0457.tar.gz
Merge bug26125
-rw-r--r--src/gm.erl13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/gm.erl b/src/gm.erl
index acc9444706..0c0ac349b0 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -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.