summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEsha Maharishi <esha.maharishi@mongodb.com>2016-08-11 21:37:03 -0400
committerEsha Maharishi <esha.maharishi@mongodb.com>2016-08-11 21:37:03 -0400
commit479256a420ebafa44932f86954743e9b439c14eb (patch)
tree0bd383c589f0c3344b50be5e86e819404a32dfd4
parent62ae8e41416c8dde5c09b9c7ce63b88bd36b3f6b (diff)
downloadmongo-479256a420ebafa44932f86954743e9b439c14eb.tar.gz
Revert "SERVER-25507 fix for 'options is undefined'"
This reverts commit 6c6bf0284642a7fe1138888d6c3044a6f4912468.
-rw-r--r--src/mongo/shell/replsettest.js5
1 files 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);