nodejs
diff --git a/Collapse file
‎lib/_stream_writable.js‎
Copy file name to clipboardExpand all lines: lib/_stream_writable.js
+6-4Lines changed: 6 additions & 4 deletions b/Collapse file
‎lib/_stream_writable.js‎
Copy file name to clipboardExpand all lines: lib/_stream_writable.js
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/Collapse file
‎test/parallel/test-stream-write-drain.js‎
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/Collapse file
‎test/parallel/test-stream-write-drain.js‎
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
@@ -480,15 +480,17 @@ function onwrite(stream, er) {
     }
 
     if (sync) {
-      process.nextTick(afterWrite, stream, state, finished, cb);
+      process.nextTick(afterWrite, stream, state, cb);
     } else {
-      afterWrite(stream, state, finished, cb);
+      afterWrite(stream, state, cb);
     }
   }
 }
 
-function afterWrite(stream, state, finished, cb) {
-  if (!finished && state.length === 0 && state.needDrain) {
+function afterWrite(stream, state, cb) {
+  const needDrain = !state.ending && !stream.destroyed && state.length === 0 &&
+    state.needDrain;
+  if (needDrain) {
     state.needDrain = false;
     stream.emit('drain');
   }
 
@@ -0,0 +1,16 @@
+'use strict';
+const common = require('../common');
+const { Writable } = require('stream');
+
+// Don't emit 'drain' if ended
+
+const w = new Writable({
+  write(data, enc, cb) {
+    process.nextTick(cb);
+  },
+  highWaterMark: 1
+});
+
+w.on('drain', common.mustNotCall());
+w.write('asd');
+w.end();
Original file line number	Diff line number	Diff line change
`@@ -480,15 +480,17 @@ function onwrite(stream, er) {`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`if (sync) {`
`483`		`- process.nextTick(afterWrite, stream, state, finished, cb);`
	`483`	`+ process.nextTick(afterWrite, stream, state, cb);`
`484`	`484`	`} else {`
`485`		`- afterWrite(stream, state, finished, cb);`
	`485`	`+ afterWrite(stream, state, cb);`
`486`	`486`	`}`
`487`	`487`	`}`
`488`	`488`	`}`
`489`	`489`
`490`		`-function afterWrite(stream, state, finished, cb) {`
`491`		`- if (!finished && state.length === 0 && state.needDrain) {`
	`490`	`+function afterWrite(stream, state, cb) {`
	`491`	`+ const needDrain = !state.ending && !stream.destroyed && state.length === 0 &&`
	`492`	`+ state.needDrain;`
	`493`	`+ if (needDrain) {`
`492`	`494`	`state.needDrain = false;`
`493`	`495`	`stream.emit('drain');`
`494`	`496`	`}`