Revert "stream: remove ambiguous code"

This reverts commit ce62e96. PR-URL: #29717 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Beth Griggs <[email protected]>
nodejs · Oct 10, 2019 · 8c60685 · 8c60685
1 parent 7682874
commit 8c60685
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -59,23 +59,25 @@ function eos(stream, opts, callback) {
     };
   }
 
-  const readable = opts.readable ||
+  let readable = opts.readable ||
     (opts.readable !== false && isReadable(stream));
-  const writable = opts.writable ||
+  let writable = opts.writable ||
     (opts.writable !== false && isWritable(stream));
 
   const onlegacyfinish = () => {
     if (!stream.writable) onfinish();
   };
 
   const onfinish = () => {
+    writable = false;
     writableFinished = true;
-    if (!readable || readableEnded) callback.call(stream);
+    if (!readable) callback.call(stream);
   };
 
   const onend = () => {
+    readable = false;
     readableEnded = true;
-    if (!writable || writableFinished) callback.call(stream);
+    if (!writable) callback.call(stream);
   };
 
   const onclose = () => {