diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 20:22:01 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-04-23 20:22:01 +0100 |
| commit | b249628b8264f02d8653fb8ae3276f828222de0c (patch) | |
| tree | 8213ad2ea8d971bdcb5664d02b07e34580052729 | |
| parent | 1239f35a390aabe72091dfd749c63251845b7d45 (diff) | |
| parent | 0da58fd7cbfab33ae35ed07bc039a04c69c6329f (diff) | |
| download | rabbitmq-server-git-b249628b8264f02d8653fb8ae3276f828222de0c.tar.gz | |
merge stable into default
| -rw-r--r-- | src/gm.erl | 13 |
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. |
