Skip to content

Revert "stream: do not emit drain if stream ended" #29272

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
mcollina wants to merge 1 commit into from
Closed

Revert "stream: do not emit drain if stream ended" #29272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Revert "stream: do not emit drain if stream ended" 
This reverts commit 605d7c4.
  • Loading branch information
@mcollina
mcollina committed Aug 22, 2019
commit 44dbb17f2dc5977e0b232dd5bc3fad59ad2dbd03
10 changes: 4 additions & 6 deletions lib/_stream_writable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,17 +479,15 @@ function onwrite(stream, er) {
}

if (sync) {
process.nextTick(afterWrite, stream, state, cb);
process.nextTick(afterWrite, stream, state, finished, cb);
} else {
afterWrite(stream, state, cb);
afterWrite(stream, state, finished, cb);
}
}
}

function afterWrite(stream, state, cb) {
const needDrain = !state.ending && !stream.destroyed && state.length === 0 &&
state.needDrain;
if (needDrain) {
function afterWrite(stream, state, finished, cb) {
if (!finished && state.length === 0 && state.needDrain) {
state.needDrain = false;
stream.emit('drain');
}
Expand Down
16 changes: 0 additions & 16 deletions test/parallel/test-stream-write-drain.js
View file
Open in desktop

This file was deleted.