diff options
author | Sree Kuchibhotla <sreek@google.com> | 2017-04-13 03:13:17 -0700 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2017-04-13 03:13:17 -0700 |
commit | aa5a92800fb4f58ea76cf96dded611f68e1bdcec (patch) | |
tree | 3f8805e7cd0fa4300d6c6703059b8309c9d34deb /src/node/ext/server.cc | |
parent | 840a1352150b5e52068dbfc2e02f43d91ecb9c1c (diff) | |
parent | b78e80c0961bf87cae82a1cf7d6e200d6787c73a (diff) |
Merge branch 'master' into cq_create_api_changes
Diffstat (limited to 'src/node/ext/server.cc')
-rw-r--r-- | src/node/ext/server.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/ext/server.cc b/src/node/ext/server.cc index ccb55aa54c..f0920c842a 100644 --- a/src/node/ext/server.cc +++ b/src/node/ext/server.cc @@ -193,7 +193,7 @@ NAN_METHOD(Server::RequestCall) { GetCompletionQueue(), GetCompletionQueue(), new struct tag(new Callback(info[0].As<Function>()), ops.release(), - NULL)); + NULL, Nan::Null())); if (error != GRPC_CALL_OK) { return Nan::ThrowError(nanErrorWithCode("requestCall failed", error)); } @@ -246,7 +246,7 @@ NAN_METHOD(Server::TryShutdown) { grpc_server_shutdown_and_notify( server->wrapped_server, GetCompletionQueue(), new struct tag(new Nan::Callback(info[0].As<Function>()), ops.release(), - NULL)); + NULL, Nan::Null())); CompletionQueueNext(); } |