diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc index d294b641ffa444..7709e24a6b4d93 100644 --- a/src/stream_wrap.cc +++ b/src/stream_wrap.cc @@ -222,13 +222,18 @@ void StreamWrap::OnReadImpl(ssize_t nread, } -void StreamWrap::OnReadCommon(uv_stream_t* handle, - ssize_t nread, - const uv_buf_t* buf, - uv_handle_type pending) { +void StreamWrap::OnRead(uv_stream_t* handle, + ssize_t nread, + const uv_buf_t* buf) { StreamWrap* wrap = static_cast(handle->data); HandleScope scope(wrap->env()->isolate()); Context::Scope context_scope(wrap->env()->context()); + uv_handle_type type = UV_UNKNOWN_HANDLE; + + if (wrap->is_named_pipe_ipc() && + uv_pipe_pending_count(reinterpret_cast(handle)) > 0) { + type = uv_pipe_pending_type(reinterpret_cast(handle)); + } // We should not be getting this callback if someone as already called // uv_close() on the handle. @@ -242,22 +247,7 @@ void StreamWrap::OnReadCommon(uv_stream_t* handle, } } - static_cast(wrap)->OnRead(nread, buf, pending); -} - - -void StreamWrap::OnRead(uv_stream_t* handle, - ssize_t nread, - const uv_buf_t* buf) { - StreamWrap* wrap = static_cast(handle->data); - uv_handle_type type = UV_UNKNOWN_HANDLE; - - if (wrap->is_named_pipe_ipc() && - uv_pipe_pending_count(reinterpret_cast(handle)) > 0) { - type = uv_pipe_pending_type(reinterpret_cast(handle)); - } - - OnReadCommon(handle, nread, buf, type); + static_cast(wrap)->OnRead(nread, buf, type); } diff --git a/src/stream_wrap.h b/src/stream_wrap.h index e930670202d2d8..3b2ce8ee3beb00 100644 --- a/src/stream_wrap.h +++ b/src/stream_wrap.h @@ -84,10 +84,6 @@ class StreamWrap : public HandleWrap, public StreamBase { static void OnRead(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf); - static void OnReadCommon(uv_stream_t* handle, - ssize_t nread, - const uv_buf_t* buf, - uv_handle_type pending); static void AfterWrite(uv_write_t* req, int status); static void AfterShutdown(uv_shutdown_t* req, int status);