diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-16 14:59:57 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-16 14:59:57 +0000 |
| commit | aa18336338215e493606d58ee4cbe89c69b13e18 (patch) | |
| tree | 54b6cc8d23834d7fb6b8b88b653f1fd132a0b2aa | |
| parent | d8506234a0b6ddf189c5f012973e2cd17c0ed061 (diff) | |
| download | rabbitmq-server-bug24676.tar.gz | |
fix supervisor2 bug reported by dialyzerbug24676
The erroneous code is invoked when a child terminates normally at the
same time as it is being terminated by the supervisor. So
unsurprisingly we haven't seen this, and it's hard to test.
| -rw-r--r-- | src/supervisor2.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl index f75da872..26ea502c 100644 --- a/src/supervisor2.erl +++ b/src/supervisor2.erl @@ -717,8 +717,8 @@ do_terminate(Child, SupName) when Child#child.pid =/= undefined -> ok; {error, normal} -> case Child#child.restart_type of - permanent -> ReportError(normal); - {permanent, _Delay} -> ReportError(normal); + permanent -> ReportError(normal, Child); + {permanent, _Delay} -> ReportError(normal, Child); _ -> ok end; {error, OtherReason} -> |