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

addaleax · codebytere · commit c84b4204571e · 2019-01-28T21:54:52.000-08:00
This reverts commit ac1f56c. Refs: #24288 Refs: #24075 PR-URL: #24290 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Ouyang Yadong <oyydoibh@gmail.com>
diff --git a/lib/net.js b/lib/net.js
@@ -349,12 +349,6 @@ 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();
 

-Original file line number
+Diff line change
 returnthis.once('connect',()=>this._final(cb));
+}
 -// TODO(addaleax): This should not be necessary.
 -if(!this.readable||this._readableState.ended){
 -cb();
 -returnthis.destroy();
 -}
+-
 if(!this._handle)
 returncb();