diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-09-03 17:00:02 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-09-03 17:00:02 +0100 |
| commit | 3fa43eee504f76d897aca47f056e8d06444d09a0 (patch) | |
| tree | fc064a330cd5267cad7e81f6af4fbd67c56ab762 /src | |
| parent | ac9354b322fac5ec4207d63feac5e87549e41dbe (diff) | |
| download | rabbitmq-server-git-3fa43eee504f76d897aca47f056e8d06444d09a0.tar.gz | |
construct child exit reason in the right place
Diffstat (limited to 'src')
| -rw-r--r-- | src/supervisor2.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl index 89a8fd9213..9644e17d8b 100644 --- a/src/supervisor2.erl +++ b/src/supervisor2.erl @@ -837,7 +837,8 @@ terminate_simple_children(Child, Dynamics, SupName) -> (Pid, {error, R}) -> ReportError(R, Child#child{pid = Pid}) end, [receive - {'EXIT', Pid, Reason} -> Report(Pid, Reason) + {'EXIT', Pid, Reason} -> + Report(Pid, child_res(Child, Reason, Timedout)) after 0 -> Report(Pid, Reply) end || {Pid, Reply} <- Replies], |