diff options
author | Zandra Hird <[email protected]> | 2015-05-29 14:34:27 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-05-29 14:34:27 +0200 |
commit | 5889686cb7252e9019b88492726a1237d3e8566d (patch) | |
tree | 649d3494b73686644bde8415504bd9d3d68f0a10 /lib/stdlib/src | |
parent | 585a0448b8e04927b1516298a91568565fa00441 (diff) | |
parent | 000c33662b8a98870a97a3499076895d4e832563 (diff) | |
download | otp-5889686cb7252e9019b88492726a1237d3e8566d.tar.gz otp-5889686cb7252e9019b88492726a1237d3e8566d.tar.bz2 otp-5889686cb7252e9019b88492726a1237d3e8566d.zip |
Merge branch 'fishcakez/supervisor_ignore'
* fishcakez/supervisor_ignore:
Don't store child that returns ignore in simple supervisor
OTP-12793
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r-- | lib/stdlib/src/supervisor.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index 67655b1145..1d7396adee 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -381,7 +381,7 @@ handle_call({start_child, EArgs}, _From, State) when ?is_simple(State) -> #child{mfargs = {M, F, A}} = Child, Args = A ++ EArgs, case do_start_child_i(M, F, Args) of - {ok, undefined} when Child#child.restart_type =:= temporary -> + {ok, undefined} -> {reply, {ok, undefined}, State}; {ok, Pid} -> NState = save_dynamic_child(Child#child.restart_type, Pid, Args, State), |