Skip to content

Commit 7e5e34d

Browse files
lundibunditargos
authored andcommittedApr 20, 2020
src: simplify node_worker.cc using new KVStore API
PR-URL: #31773 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 7152fe3 commit 7e5e34d

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed
 

‎src/node_worker.cc

+4-8
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ using v8::Integer;
3030
using v8::Isolate;
3131
using v8::Local;
3232
using v8::Locker;
33+
using v8::Maybe;
3334
using v8::MaybeLocal;
3435
using v8::Null;
3536
using v8::Number;
@@ -504,14 +505,9 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
504505
if (args[1]->IsObject() || args[2]->IsArray()) {
505506
per_isolate_opts.reset(new PerIsolateOptions());
506507

507-
HandleEnvOptions(
508-
per_isolate_opts->per_env, [isolate, &env_vars](const char* name) {
509-
MaybeLocal<String> value =
510-
env_vars->Get(isolate, OneByteString(isolate, name));
511-
return value.IsEmpty() ? std::string{}
512-
: std::string(*String::Utf8Value(
513-
isolate, value.ToLocalChecked()));
514-
});
508+
HandleEnvOptions(per_isolate_opts->per_env, [&env_vars](const char* name) {
509+
return env_vars->Get(name).FromMaybe("");
510+
});
515511

516512
#ifndef NODE_WITHOUT_NODE_OPTIONS
517513
MaybeLocal<String> maybe_node_opts =

0 commit comments

Comments
 (0)
Please sign in to comment.