fixup! code review

nodejs · Feb 1, 2021 · 3f712a5 · 3f712a5
1 parent d0a4b32
commit 3f712a5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/internal/streams/from.js b/lib/internal/streams/from.js
@@ -52,13 +52,13 @@ function from(Readable, iterable, opts) {
   readable._destroy = function(error, cb) {
     close(error).then(
       () => process.nextTick(cb, error), // nextTick is here in case cb throws
-      (e) => process.nextTick(cb, error || e),
+      (e) => process.nextTick(cb, e || error),
     );
   };
 
   async function close(error) {
-    const hadError = typeof error !== 'undefined';
-    const hasThrow = typeof iterator.return === 'function';
+    const hadError = (error !== undefined) && (error !== null);
+    const hasThrow = typeof iterator.throw === 'function';
     if (hadError && hasThrow) {
       const { value, done } = await iterator.throw(error);
       await value;