Skip to content

src: fix domains + --abort-on-uncaught-exception #922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chrisdickinson wants to merge 7 commits into from
Closed

src: fix domains + --abort-on-uncaught-exception #922

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ccdd2c
src: fix domains + --abort-on-uncaught-exception
chrisdickinson Feb 22, 2015
10e8bc6
add netServer test
chrisdickinson Feb 22, 2015
b67ed52
rename test
chrisdickinson Feb 22, 2015
43bed4d
preserve original context
chrisdickinson Feb 22, 2015
6c55bae
fix typo
chrisdickinson Feb 22, 2015
ecc033a
actually execute the code!
chrisdickinson Feb 23, 2015
2e1332b
fix per @bnoordhuis review
chrisdickinson Feb 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
actually execute the code!
  • Loading branch information
@chrisdickinson
chrisdickinson committed Feb 23, 2015
commit ecc033a96a0f21e6f98a974451b8cf7cf1ea76d4
6 changes: 3 additions & 3 deletions src/async-wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ Handle<Value> AsyncWrap::MakeCallback(const Handle<Function> cb,
Local<Value> ret;

if (has_abort_on_uncaught_and_domains) {
Local<Value> fn = context->Get(env()->domain_abort_uncaught_exc_string());
Local<Value> fn = process->Get(env()->domain_abort_uncaught_exc_string());
if (fn->IsFunction()) {
Local<Array> specialContext;
Local<Array> specialContext = Array::New(env()->isolate(), 2);
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Feb 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor style nit: snake_case, not camelCase.

specialContext->Set(0, context);
specialContext->Set(1, cb);
ret = fn.As<Function>()->Call(specialContext, argc, argv);
ret = fn.As<Function>()->Call(specialContext.As<Object>(), argc, argv);
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Feb 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Array is-a Object, you don't have to cast it.

} else {
ret = cb->Call(context, argc, argv);
}
Expand Down