1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: remove unnecessary block scope

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18291
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Anatoli Papirovski 2018-01-21 10:34:36 -05:00
parent 46e0a55b84
commit 7d3a3028ff
No known key found for this signature in database
GPG Key ID: 614E2E1ABEB4B2C0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node.cc
View File

@ -1066,17 +1066,13 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env,
return Undefined(env->isolate()); return Undefined(env->isolate());
} }
MaybeLocal<Value> ret; MaybeLocal<Value> ret = callback->Call(env->context(), recv, argc, argv);
{ if (ret.IsEmpty()) {
ret = callback->Call(env->context(), recv, argc, argv); // NOTE: For backwards compatibility with public API we return Undefined()
// if the top level call threw.
if (ret.IsEmpty()) { scope.MarkAsFailed();
// NOTE: For backwards compatibility with public API we return Undefined() return scope.IsInnerMakeCallback() ? ret : Undefined(env->isolate());
// if the top level call threw.
scope.MarkAsFailed();
return scope.IsInnerMakeCallback() ? ret : Undefined(env->isolate());
}
} }
scope.Close(); scope.Close();