diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2012-05-25 11:42:07 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2012-05-25 11:42:07 +0100 |
| commit | bf96c3de075dac375b8b39c4affbf28f2bc5c56a (patch) | |
| tree | 7622c40e6a7131b5c1ad29d548fb9b14a4f21f92 /src/gm.erl | |
| parent | 51fd9083b5191c0740144cb4d2793e134f5e8ed0 (diff) | |
| parent | 67c70e44aa97b8956f608728a87f5fbeea82c4ba (diff) | |
| download | rabbitmq-server-git-bf96c3de075dac375b8b39c4affbf28f2bc5c56a.tar.gz | |
Merging bug 24945 into default
Diffstat (limited to 'src/gm.erl')
| -rw-r--r-- | src/gm.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gm.erl b/src/gm.erl index 82196c73b7..fc13528029 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -693,9 +693,13 @@ terminate(Reason, State = #state { module = Module, code_change(_OldVsn, State, _Extra) -> {ok, State}. -prioritise_info(flush, _State) -> 1; -prioritise_info({'DOWN', _MRef, process, _Pid, _Reason}, _State) -> 1; -prioritise_info(_ , _State) -> 0. +prioritise_info(flush, _State) -> + 1; +prioritise_info({'DOWN', _MRef, process, _Pid, _Reason}, + #state { members_state = MS }) when MS /= undefined -> + 1; +prioritise_info(_, _State) -> + 0. handle_msg(check_neighbours, State) -> @@ -853,7 +857,7 @@ flush_broadcast_buffer(State = #state { self = Self, members_state = MembersState, broadcast_buffer = Buffer, pub_count = PubCount }) -> - [{PubCount, _Msg}|_] = Buffer, + [{PubCount, _Msg}|_] = Buffer, %% ASSERTION match on PubCount Pubs = lists:reverse(Buffer), Activity = activity_cons(Self, Pubs, [], activity_nil()), ok = maybe_send_activity(activity_finalise(Activity), State), |