summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Norris <trev.norris@gmail.com>2013-07-10 10:35:57 -0700
committerTrevor Norris <trev.norris@gmail.com>2013-07-10 10:46:48 -0700
commit6d91bd37075a53f42bab01915fa89ba4a4f0a075 (patch)
tree4707d33423e4ec2542e0f79bf4641d3f7f1a8d2a
parent610269295b534b846d1e9afee540a216e5c7a56b (diff)
downloadnode-6d91bd37075a53f42bab01915fa89ba4a4f0a075.tar.gz
node: call MakeDomainCallback in all domain cases
Previously there was no way to pass a Function callback directly to MakeCallback and support domains. The check has been added so that users never have to worry about supporting domains while using MakeCallback.
-rw-r--r--src/node.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/node.cc b/src/node.cc
index 94af50941..4e9754f8f 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1007,6 +1007,9 @@ MakeCallback(const Handle<Object> object,
Handle<Value> argv[]) {
// TODO Hook for long stack traces to be made here.
+ if (using_domains)
+ return MakeDomainCallback(object, callback, argc, argv);
+
// lazy load no domain next tick callbacks
if (process_tickCallback.IsEmpty()) {
Local<Value> cb_v = process->Get(String::New("_tickCallback"));