summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-05-07 07:53:03 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2013-05-07 07:53:03 +0100
commit5bb9d6aa334df375145d1fab37c586f996c3e06d (patch)
treeed37d9a8190099887529be326cc7c9e78f99161c
parent0c9b98ffbbc06395c46c2b2b909b6548b8648f6e (diff)
parent5b3fccb6dcec837fc7e00a0fbee0a9f72f07eaa4 (diff)
downloadrabbitmq-server-5bb9d6aa334df375145d1fab37c586f996c3e06d.tar.gz
merge bug23958 into default
-rw-r--r--src/supervisor2.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index 8b0899a6..a51bc15c 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -655,8 +655,9 @@ handle_cast({try_again_restart,Pid,Reason}, #state{children=[Child]}=State)
end;
handle_cast({try_again_restart,Name,Reason}, State) ->
- case lists:keyfind(Name,#child.name,State#state.children) of
- Child = #child{pid=?restarting(_), restart_type=RestartType} ->
+ %% we still support >= R12-B3 in which lists:keyfind/3 doesn't exist
+ case lists:keysearch(Name,#child.name,State#state.children) of
+ {value, Child = #child{pid=?restarting(_), restart_type=RestartType}} ->
try_restart(RestartType, Reason, Child, State);
_ ->
{noreply,State}