aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/global.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-10-09 11:38:49 +0200
committerHans Bolinder <[email protected]>2015-10-09 11:38:49 +0200
commit593383928d42ecf355ba51c70e5149a25d43d56d (patch)
tree9128fe70fa559aeed8d518782ea4f91c09be5ace /lib/kernel/src/global.erl
parent7d88a6e607b0bc06a0d0cab0afbf81abfe9bef41 (diff)
parent13c39e40ff18ab1ab5ddeb0a5bde99658e3fab74 (diff)
downloadotp-593383928d42ecf355ba51c70e5149a25d43d56d.tar.gz
otp-593383928d42ecf355ba51c70e5149a25d43d56d.tar.bz2
otp-593383928d42ecf355ba51c70e5149a25d43d56d.zip
Merge branch 'ks/dialyzer/undefined_record_fields/OTP-12719'
* ks/dialyzer/undefined_record_fields/OTP-12719: Update Debugger Update Diameter Update Eunit Update Inets Update Reltool Update SSL Update Test Server Update Syntax Tools Update Tools Update and cleanup HiPE records Fix errors in dialyzer_{coordinator,worker} specs Update Dialyzer Update Compiler stdlib: Refactor the supervisor module's state Update Kernel and STDLIB Take out automatic insertion of 'undefined' from typed record fields
Diffstat (limited to 'lib/kernel/src/global.erl')
-rw-r--r--lib/kernel/src/global.erl20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index 2be1efaf24..dcabeb5e49 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -459,17 +459,17 @@ init([]) ->
no_trace
end,
+ Ca = case init:get_argument(connect_all) of
+ {ok, [["false"]]} ->
+ false;
+ _ ->
+ true
+ end,
S = #state{the_locker = start_the_locker(DoTrace),
trace = T0,
- the_registrar = start_the_registrar()},
- S1 = trace_message(S, {init, node()}, []),
-
- case init:get_argument(connect_all) of
- {ok, [["false"]]} ->
- {ok, S1#state{connect_all = false}};
- _ ->
- {ok, S1#state{connect_all = true}}
- end.
+ the_registrar = start_the_registrar(),
+ connect_all = Ca},
+ {ok, trace_message(S, {init, node()}, [])}.
%%-----------------------------------------------------------------
%% Connection algorithm