summaryrefslogtreecommitdiff
path: root/src/stream_base.cc
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2017-05-21 19:29:26 +0200
committerAnna Henningsen <anna@addaleax.net>2017-05-25 20:02:17 +0200
commit169c07dae122ea78c1a7fd7fbfac1da9434ce1e5 (patch)
treef29451493f8754e9755d6150884cd49f2d299a8c /src/stream_base.cc
parent06757cd0dcbba6a3839faa9ca1d4e3b99036fdfa (diff)
downloadandroid-node-v8-169c07dae122ea78c1a7fd7fbfac1da9434ce1e5.tar.gz
android-node-v8-169c07dae122ea78c1a7fd7fbfac1da9434ce1e5.tar.bz2
android-node-v8-169c07dae122ea78c1a7fd7fbfac1da9434ce1e5.zip
src: make StreamBase::GetAsyncWrap pure virtual
PR-URL: https://github.com/nodejs/node/pull/13174 Reviewed-By: Andreas Madsen <amwebdk@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Diffstat (limited to 'src/stream_base.cc')
-rw-r--r--src/stream_base.cc24
1 files changed, 5 insertions, 19 deletions
diff --git a/src/stream_base.cc b/src/stream_base.cc
index 1cf1e44bd8..c4b59ee5ca 100644
--- a/src/stream_base.cc
+++ b/src/stream_base.cc
@@ -54,8 +54,8 @@ int StreamBase::Shutdown(const FunctionCallbackInfo<Value>& args) {
Local<Object> req_wrap_obj = args[0].As<Object>();
AsyncWrap* wrap = GetAsyncWrap();
- if (wrap != nullptr)
- env->set_init_trigger_id(wrap->get_id());
+ CHECK_NE(wrap, nullptr);
+ env->set_init_trigger_id(wrap->get_id());
ShutdownWrap* req_wrap = new ShutdownWrap(env,
req_wrap_obj,
this,
@@ -133,8 +133,6 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
return UV_ENOBUFS;
AsyncWrap* wrap = GetAsyncWrap();
- // NOTE: All tests show that GetAsyncWrap() never returns nullptr here. If it
- // can then replace the CHECK_NE() with if (wrap != nullptr).
CHECK_NE(wrap, nullptr);
env->set_init_trigger_id(wrap->get_id());
WriteWrap* req_wrap = WriteWrap::New(env,
@@ -425,16 +423,9 @@ void StreamBase::EmitData(ssize_t nread,
if (argv[2].IsEmpty())
argv[2] = Undefined(env->isolate());
- AsyncWrap* async = GetAsyncWrap();
- if (async == nullptr) {
- node::MakeCallback(env,
- GetObject(),
- env->onread_string(),
- arraysize(argv),
- argv);
- } else {
- async->MakeCallback(env->onread_string(), arraysize(argv), argv);
- }
+ AsyncWrap* wrap = GetAsyncWrap();
+ CHECK_NE(wrap, nullptr);
+ wrap->MakeCallback(env->onread_string(), arraysize(argv), argv);
}
@@ -448,11 +439,6 @@ int StreamBase::GetFD() {
}
-AsyncWrap* StreamBase::GetAsyncWrap() {
- return nullptr;
-}
-
-
Local<Object> StreamBase::GetObject() {
return GetAsyncWrap()->object();
}