Skip to content

http2: use getter replace use directly _witableState.finished #28007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zero1five wants to merge 2 commits into from
Closed

http2: use getter replace use directly _witableState.finished #28007

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd6ccc
stream: add writableFinished
zero1five Jun 1, 2019
2c66f6c
http2: use writableFinished instead of _writableState
zero1five Jun 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
http2: use writableFinished instead of _writableState
  • Loading branch information
@zero1five
zero1five committed Jun 24, 2019
commit 2c66f6c09bcf79c8dfe955144be4fda5bbabca8b
7 changes: 3 additions & 4 deletions lib/internal/http2/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ function closeStream(stream, code, rstStreamStatus = kSubmitRstStream) {
stream.setTimeout(0);
stream.removeAllListeners('timeout');

const { ending, finished } = stream._writableState;
const { ending } = stream._writableState;

if (!ending) {
// If the writable side of the Http2Stream is still open, emit the
Expand All @@ -1572,7 +1572,7 @@ function closeStream(stream, code, rstStreamStatus = kSubmitRstStream) {

if (rstStreamStatus !== kNoRstStream) {
const finishFn = finishCloseStream.bind(stream, code);
if (!ending || finished || code !== NGHTTP2_NO_ERROR ||
if (!ending || stream.writableFinished || code !== NGHTTP2_NO_ERROR ||
rstStreamStatus === kForceRstStream)
finishFn();
else
Expand Down Expand Up @@ -1982,8 +1982,7 @@ class Http2Stream extends Duplex {
return;
}

// TODO(mcollina): remove usage of _*State properties
if (this._writableState.finished) {
if (this.writableFinished) {
if (!this.readable && this.closed) {
this.destroy();
return;
Expand Down