New upstream version 6.0.20upstream

1 files changed, 13 insertions, 13 deletions

diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 1040b3c991d..ece24b66a6b 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -25,17 +25,6 @@ var _parsePath = function() {
     return dbpath;
 };
 
-var _parsePort = function() {
-    var port = "";
-    for (var i = 0; i < arguments.length; ++i)
-        if (arguments[i] == "--port")
-            port = arguments[i + 1];
-
-    if (port == "")
-        throw Error("No port specified");
-    return port;
-};
-
 var createMongoArgs = function(binaryName, args) {
     if (!Array.isArray(args)) {
         throw new Error("The second argument to createMongoArgs must be an array");
@@ -82,6 +71,17 @@ MongoRunner.mongosPath = "mongos";
 MongoRunner.mongoqPath = "mongoqd";
 MongoRunner.mongoShellPath = "mongo";
 
+MongoRunner.parsePort = function() {
+    var port = "";
+    for (var i = 0; i < arguments.length; ++i)
+        if (arguments[i] == "--port")
+            port = arguments[i + 1];
+
+    if (port == "")
+        throw Error("No port specified");
+    return port;
+};
+
 MongoRunner.VersionSub = function(pattern, version) {
     this.pattern = pattern;
     this.version = version;
@@ -1640,7 +1640,7 @@ MongoRunner._startWithArgs = function(argArray, env, waitForConnect) {
     // TODO: Make there only be one codepath for starting mongo processes
 
     argArray = appendSetParameterArgs(argArray);
-    var port = _parsePort.apply(null, argArray);
+    var port = MongoRunner.parsePort.apply(null, argArray);
     var pid = -1;
     if (env === undefined) {
         pid = _startMongoProgram.apply(null, argArray);
@@ -1675,7 +1675,7 @@ MongoRunner._startWithArgs = function(argArray, env, waitForConnect) {
  * command line arguments to the program.
  */
 startMongoProgram = function() {
-    var port = _parsePort.apply(null, arguments);
+    var port = MongoRunner.parsePort.apply(null, arguments);
 
     // Enable test commands.
     // TODO: Make this work better with multi-version testing so that we can support