revert changes in _final

Author: arturgawlik

lib/net.js

@@ -531,14 +531,7 @@ Socket.prototype._final = function(cb) {
   // If still connecting - defer handling `_final` until 'connect' will happen
   if (this.connecting) {
     debug('_final: not yet connected');
-    if (!this._finalizingOnConnect) {
-      this._finalizingOnConnect = true;
-      this.once('connect', () => {
-        this._final(cb);
-        this._finalizingOnConnect = false;
-      });
-    }
-    return;
+    return this.once('connect', () => this._final(cb));
   }
 
   if (!this._handle)
@@ -810,8 +803,8 @@ Socket.prototype.destroySoon = function() {
   else if (!this._destroyingOnFinish) {
     this._destroyingOnFinish = true;
     this.once('finish', () => {
-      this.destroy();
       this._destroyingOnFinish = false;
+      this.destroy();
     });
   }
 };

test/parallel/test-net-socket-not-duplicates-destroy-soon-listeners.js

@@ -3,20 +3,13 @@ require('../common');
 const { addresses } = require('../common/internet');
 
 const assert = require('assert');
-const net = require('net');
+const { Socket } = require('net');
 
-const socket = new net.Socket();
+const socket = new Socket();
 socket.on('error', () => {
   // noop
 });
-const connectOptions = { host: addresses.INVALID_HOST, port: 1234 };
-
-socket.connect(connectOptions);
-socket.destroySoon(); // Adds "connect" and "finish" event listeners when socket has "writable" state
-socket.destroy(); // Makes imideditly socket again "writable"
-
-socket.connect(connectOptions);
-socket.destroySoon(); // Should not duplicate "connect" and "finish" event listeners
-
+socket.connect({ host: addresses.INVALID_HOST, port: 1234 });
+socket.destroySoon();
+socket.destroySoon();
 assert.strictEqual(socket.listeners('finish').length, 1);
-assert.strictEqual(socket.listeners('connect').length, 1);