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 | 1239f35a390aabe72091dfd749c63251845b7d45 (patch) | |
| tree | 6ed1d1a376e0de29dbc5cd20be9f89adfef58823 | |
| parent | de6383d100e02428e3abbdd44ead89ce9bf6e013 (diff) | |
| parent | 0cf5ce34c085a47107337b6bbb65b5f147659f95 (diff) | |
| download | rabbitmq-server-git-1239f35a390aabe72091dfd749c63251845b7d45.tar.gz | |
merge stable into default
| -rw-r--r-- | src/gm.erl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gm.erl b/src/gm.erl index 5e9ed460fa..acc9444706 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -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. |
