aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2013-02-14 07:54:47 +0100
committerHans Bolinder <[email protected]>2013-02-14 07:54:47 +0100
commitfea2580dd33765f33f086404257b1654c280e840 (patch)
tree3236be4eb98cdc0c85007f70ab32d9372d3db367 /lib
parentaabb9531d01fd414998115409d489c02b7761c9a (diff)
parent5af2145f3962799ff762a60d504c1e920ded3a5b (diff)
downloadotp-fea2580dd33765f33f086404257b1654c280e840.tar.gz
otp-fea2580dd33765f33f086404257b1654c280e840.tar.bz2
otp-fea2580dd33765f33f086404257b1654c280e840.zip
Merge branch 'hb/kernel/application_bug_fix/OTP-10754'
* hb/kernel/application_bug_fix/OTP-10754: [kernel] FIx a bug that could cause crash with wrong reason
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/src/application_controller.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index 1602745669..9ed2c7a7d9 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -495,6 +495,8 @@ init(Init, Kernel) ->
{'EXIT', LoadError} ->
Reason = {'load error', LoadError},
Init ! {ack, self(), {error, to_string(Reason)}};
+ {error, Error} ->
+ Init ! {ack, self(), {error, to_string(Error)}};
{ok, NewS} ->
Init ! {ack, self(), ok},
gen_server:enter_loop(?MODULE, [], NewS,