Skip to content

Commit

Permalink
src: use maybe versions of methods
Browse files Browse the repository at this point in the history
Fixes: #15864
  • Loading branch information
Tom Boutell authored and Trott committed Oct 27, 2017
1 parent 2438877 commit 8a71bae
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions src/inspector_agent.cc
Original file line number Diff line number Diff line change
Expand Up @@ -496,11 +496,11 @@ bool Agent::StartIoThread(bool wait_for_connect) {

v8::Isolate* isolate = parent_env_->isolate();
HandleScope handle_scope(isolate);
auto context = parent_env_->context();

// Enable tracking of async stack traces
if (!enable_async_hook_function_.IsEmpty()) {
Local<Function> enable_fn = enable_async_hook_function_.Get(isolate);
auto context = parent_env_->context();
auto result = enable_fn->Call(context, Undefined(isolate), 0, nullptr);
if (result.IsEmpty()) {
FatalError(
Expand All @@ -512,14 +512,15 @@ bool Agent::StartIoThread(bool wait_for_connect) {
// Send message to enable debug in workers
Local<Object> process_object = parent_env_->process_object();
Local<Value> emit_fn =
process_object->Get(FIXED_ONE_BYTE_STRING(isolate, "emit"));
process_object->Get(context, FIXED_ONE_BYTE_STRING(isolate, "emit"))
.ToLocalChecked();
// In case the thread started early during the startup
if (!emit_fn->IsFunction())
return true;

Local<Object> message = Object::New(isolate);
message->Set(FIXED_ONE_BYTE_STRING(isolate, "cmd"),
FIXED_ONE_BYTE_STRING(isolate, "NODE_DEBUG_ENABLED"));
message->Set(context, FIXED_ONE_BYTE_STRING(isolate, "cmd"),
FIXED_ONE_BYTE_STRING(isolate, "NODE_DEBUG_ENABLED")).FromJust();
Local<Value> argv[] = {
FIXED_ONE_BYTE_STRING(isolate, "internalMessage"),
message
Expand Down
2 changes: 1 addition & 1 deletion src/inspector_js_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ void Open(const FunctionCallbackInfo<Value>& args) {
}

if (args.Length() > 2 && args[2]->IsBoolean()) {
wait_for_connect = args[2]->BooleanValue();
wait_for_connect = args[2]->BooleanValue(env->context()).FromJust();
}

agent->StartIoThread(wait_for_connect);
Expand Down

0 comments on commit 8a71bae

Please sign in to comment.