summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-08-09 15:58:33 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-08-09 15:58:33 +0100
commite1caa3548a3496d98b65e67aaab5f8514f42bd42 (patch)
treeb64b17d590adf2cd85df77280572ac9baaca78b6
parent83b71732addc6b35b97b1e69a1eb29a0ab1932d1 (diff)
downloadrabbitmq-server-bug23098.tar.gz
On reaching the max_restart_intensited, don't remove the child spec. Instead just blank out the child's pid, thus ensuring terminate works correctly even for simple_one_for_one_terminatebug23098
-rw-r--r--src/supervisor2.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index fb4c9b02..ecb2655f 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -555,7 +555,7 @@ restart(Child, State) ->
{terminate, NState} ->
report_error(shutdown, reached_max_restart_intensity,
Child, State#state.name),
- {shutdown, remove_child(Child, NState)}
+ {shutdown, state_del_child(Child, NState)}
end.
restart1(Child, State) ->