aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/global.erl
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-10-06 15:08:57 +0200
committerHans Bolinder <[email protected]>2015-10-08 15:09:28 +0200
commit3224c9b0b7022ccf2483af95f4efd8a6b6234f47 (patch)
treeb9811fdf7782a0847f1a5da787752616e865a365 /lib/kernel/src/global.erl
parent6e93fb788aebb9050da2166749b41ff54197e049 (diff)
downloadotp-3224c9b0b7022ccf2483af95f4efd8a6b6234f47.tar.gz
otp-3224c9b0b7022ccf2483af95f4efd8a6b6234f47.tar.bz2
otp-3224c9b0b7022ccf2483af95f4efd8a6b6234f47.zip
Update Kernel and STDLIB
Record field types have been modified due to commit 8ce35b2: "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