@@ -54,8 +54,8 @@ int StreamBase::Shutdown(const FunctionCallbackInfo<Value>& args) {
54
54
Local<Object> req_wrap_obj = args[0 ].As <Object>();
55
55
56
56
AsyncWrap* wrap = GetAsyncWrap ();
57
- if (wrap != nullptr )
58
- env->set_init_trigger_id (wrap->get_id ());
57
+ CHECK_NE (wrap, nullptr );
58
+ env->set_init_trigger_id (wrap->get_id ());
59
59
ShutdownWrap* req_wrap = new ShutdownWrap (env,
60
60
req_wrap_obj,
61
61
this ,
@@ -133,8 +133,6 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
133
133
return UV_ENOBUFS;
134
134
135
135
AsyncWrap* wrap = GetAsyncWrap ();
136
- // NOTE: All tests show that GetAsyncWrap() never returns nullptr here. If it
137
- // can then replace the CHECK_NE() with if (wrap != nullptr).
138
136
CHECK_NE (wrap, nullptr );
139
137
env->set_init_trigger_id (wrap->get_id ());
140
138
WriteWrap* req_wrap = WriteWrap::New (env,
@@ -425,16 +423,9 @@ void StreamBase::EmitData(ssize_t nread,
425
423
if (argv[2 ].IsEmpty ())
426
424
argv[2 ] = Undefined (env->isolate ());
427
425
428
- AsyncWrap* async = GetAsyncWrap ();
429
- if (async == nullptr ) {
430
- node::MakeCallback (env,
431
- GetObject (),
432
- env->onread_string (),
433
- arraysize (argv),
434
- argv);
435
- } else {
436
- async->MakeCallback (env->onread_string (), arraysize (argv), argv);
437
- }
426
+ AsyncWrap* wrap = GetAsyncWrap ();
427
+ CHECK_NE (wrap, nullptr );
428
+ wrap->MakeCallback (env->onread_string (), arraysize (argv), argv);
438
429
}
439
430
440
431
@@ -448,11 +439,6 @@ int StreamBase::GetFD() {
448
439
}
449
440
450
441
451
- AsyncWrap* StreamBase::GetAsyncWrap () {
452
- return nullptr ;
453
- }
454
-
455
-
456
442
Local<Object> StreamBase::GetObject () {
457
443
return GetAsyncWrap ()->object ();
458
444
}
0 commit comments