net: partially revert "simplify Socket.prototype._final"

Partially revert b7e6ccd because it broke a test that was added since its last CI run. Refs: #24075 Refs: #23866 PR-URL: #24288 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]>
nodejs · Nov 13, 2018 · 7445126 · 7445126
1 parent ddbd0e1
commit 7445126
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/net.js b/lib/net.js
@@ -345,6 +345,12 @@ Socket.prototype._final = function(cb) {
     return this.once('connect', () => this._final(cb));
   }
 
+  // TODO(addaleax): This should not be necessary.
+  if (!this.readable || this._readableState.ended) {
+    cb();
+    return this.destroy();
+  }
+
   if (!this._handle)
     return cb();