src: reword command and add ternary

trevnorris · Myles Borins · commit c3d87eee497b · 2016-07-12T10:59:39.000-07:00
Make comment clear that Undefined() is returned for legacy compatibility. This will change in the future as a semver-major change, but to be able to port this to previous releases it needs to stay as is. Ref: #7048 PR-URL: #5756 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
diff --git a/src/node.cc b/src/node.cc
@@ -1177,11 +1177,10 @@ Local<Value> MakeCallback(Environment* env,
 }
 
 if (ret.IsEmpty()){
- if (callback_scope.in_makecallback())
- return ret;
- // NOTE: Undefined() is returned here for backwards compatibility.
- else
- return Undefined(env->isolate());
+ // NOTE: For backwards compatibility with public API we return Undefined()
+ // if the top level call threw.
+ return callback_scope.in_makecallback() ?
+ ret : Undefined(env->isolate()).As<Value>();
 }
 
 if (has_domain){

Original file line number	Diff line number	Diff line change
`@@ -1177,11 +1177,10 @@ Local<Value> MakeCallback(Environment* env,`
`1177`	`1177`	`}`
`1178`	`1178`
`1179`	`1179`	`if (ret.IsEmpty()){`
`1180`		`-if (callback_scope.in_makecallback())`
`1181`		`-return ret;`
`1182`		`-// NOTE: Undefined() is returned here for backwards compatibility.`
`1183`		`-else`
`1184`		`-returnUndefined(env->isolate());`
	`1180`	`+// NOTE: For backwards compatibility with public API we return Undefined()`
	`1181`	`+// if the top level call threw.`
	`1182`	`+return callback_scope.in_makecallback() ?`
	`1183`	`+ ret : Undefined(env->isolate()).As<Value>();`
`1185`	`1184`	`}`
`1186`	`1185`
`1187`	`1186`	`if (has_domain){`