refactor(topologies): connect options should extend clonedOptions

NODE-1132
mongodb · Sep 9, 2017 · 9fb3d86 · 9fb3d86
1 parent 226c803
commit 9fb3d86
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/lib/mongos.js b/lib/mongos.js
@@ -17,7 +17,8 @@ var EventEmitter = require('events').EventEmitter,
   filterOptions = require('./utils').filterOptions,
   mergeOptions = require('./utils').mergeOptions,
   getReadPreference = require('./utils').getReadPreference,
-  os = require('os');
+  os = require('os'),
+  assign = require('./utils').assign;
 
 // Get package.json variable
 var driverVersion = require('../package.json').version;
@@ -276,6 +277,7 @@ Mongos.prototype.connect = function(db, _options, callback) {
   if ('function' === typeof _options) (callback = _options), (_options = {});
   if (_options == null) _options = {};
   if (!('function' === typeof callback)) callback = null;
+  _options = assign({}, this.s.clonedOptions, _options);
   self.s.options = _options;
 
   // Update bufferMaxEntries

diff --git a/lib/replset.js b/lib/replset.js
@@ -19,7 +19,9 @@ var EventEmitter = require('events').EventEmitter,
   filterOptions = require('./utils').filterOptions,
   getReadPreference = require('./utils').getReadPreference,
   mergeOptions = require('./utils').mergeOptions,
-  os = require('os');
+  os = require('os'),
+  assign = require('./utils').assign;
+
 /**
  * @fileOverview The **ReplSet** class is a class that represents a Replicaset topology and is
  * used to construct connections.
@@ -312,6 +314,7 @@ ReplSet.prototype.connect = function(db, _options, callback) {
   if ('function' === typeof _options) (callback = _options), (_options = {});
   if (_options == null) _options = {};
   if (!('function' === typeof callback)) callback = null;
+  _options = assign({}, this.s.clonedOptions, _options);
   self.s.options = _options;
 
   // Update bufferMaxEntries

diff --git a/lib/server.js b/lib/server.js
@@ -16,7 +16,8 @@ var EventEmitter = require('events').EventEmitter,
   filterOptions = require('./utils').filterOptions,
   mergeOptions = require('./utils').mergeOptions,
   getReadPreference = require('./utils').getReadPreference,
-  os = require('os');
+  os = require('os'),
+  assign = require('./utils').assign;
 
 // Get package.json variable
 var driverVersion = require('../package.json').version;
@@ -295,8 +296,9 @@ Object.defineProperty(Server.prototype, 'port', {
 Server.prototype.connect = function(_options, callback) {
   var self = this;
   if ('function' === typeof _options) (callback = _options), (_options = {});
-  if (_options == null) _options = {};
+  if (_options == null) _options = this.s.clonedOptions;
   if (!('function' === typeof callback)) callback = null;
+  _options = assign({}, this.s.clonedOptions, _options);
   self.s.options = _options;
 
   // Update bufferMaxEntries