From 479256a420ebafa44932f86954743e9b439c14eb Mon Sep 17 00:00:00 2001 From: Esha Maharishi Date: Thu, 11 Aug 2016 21:37:03 -0400 Subject: Revert "SERVER-25507 fix for 'options is undefined'" This reverts commit 6c6bf0284642a7fe1138888d6c3044a6f4912468. --- src/mongo/shell/replsettest.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js index 570ef6d13c2..5634ba016a8 100644 --- a/src/mongo/shell/replsettest.js +++ b/src/mongo/shell/replsettest.js @@ -915,7 +915,8 @@ var ReplSetTest = function(opts) { } // If restarting a node, use its existing options as the defaults. - if ((options && options.restart) || restart) { + options.restart = options.restart || restart; + if (options.restart) { options = Object.merge(this.nodes[n].fullOptions, options); } else { options = Object.merge(defaults, options); @@ -923,8 +924,6 @@ var ReplSetTest = function(opts) { options = Object.merge(options, this.nodeOptions["n" + n]); delete options.rsConfig; - options.restart = options.restart || restart; - var pathOpts = {node: n, set: this.name}; options.pathOpts = Object.merge(options.pathOpts || {}, pathOpts); -- cgit v1.2.1