refactor(replset): reduce server count when destroyed

Author: mbroadst

lib/core/topologies/replset.js

@@ -300,15 +300,11 @@ function connectNewServers(self, servers, callback) {
 
       // Destroyed
       if (self.state === DESTROYED || self.state === UNREFERENCED) {
-        return this.destroy({ force: true });
+        this.destroy({ force: true });
+        return done();
       }
 
       if (event === 'connect') {
-        // Destroyed
-        if (self.state === DESTROYED || self.state === UNREFERENCED) {
-          return _self.destroy({ force: true });
-        }
-
         // Update the state
         var result = self.s.replicaSetState.update(_self);
         // Update the state with the new server
@@ -363,8 +359,7 @@ function connectNewServers(self, servers, callback) {
         connectingServer.destroy({ force: true });
 
         self.s.connectingServers.splice(existingServerIdx, 1);
-        done();
-        return;
+        return done();
       }
 
       // Create a new server instance