summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2016-08-16 19:11:32 +0300
committerMichael Klishin <michael@clojurewerkz.org>2016-08-16 19:11:32 +0300
commit9f1c12f8ab553aab2da435f82a805da8b08c9149 (patch)
tree2944223369fc20cf0ec1588a3ec4a7cf4216669b /src
parentccb5972bc3e75a2295a26899879b9dbdfbb736ed (diff)
parentb02d325f21e643710d0e86bbdcf4206c38182516 (diff)
downloadrabbitmq-server-git-9f1c12f8ab553aab2da435f82a805da8b08c9149.tar.gz
Merge branch 'stable'
Diffstat (limited to 'src')
-rw-r--r--src/gm.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gm.erl b/src/gm.erl
index 3554f01d56..985b5bfa6d 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -757,7 +757,10 @@ handle_info({'DOWN', MRef, process, _Pid, Reason},
catch
lost_membership ->
{stop, normal, State}
- end.
+ end;
+handle_info(_, State) ->
+ %% Discard any unexpected messages, such as late replies from neighbour_call/2
+ noreply(State).
terminate(Reason, #state { module = Module, callback_args = Args }) ->
Module:handle_terminate(Args, Reason).