SERVER-18201 Make sure js code is the last argument to mongo shell in startParallelShell

1 files changed, 12 insertions, 12 deletions

diff --git a/src/mongo/shell/servers_misc.js b/src/mongo/shell/servers_misc.js
index ec3fe887f4d..46df568dc28 100644
--- a/src/mongo/shell/servers_misc.js
+++ b/src/mongo/shell/servers_misc.js
@@ -221,6 +221,18 @@ function startParallelShell( jsCode, port, noConnect ){
 
     var args = ["mongo"];
 
+    if (typeof db == "object") {
+        var hostAndPort = db.getMongo().host.split(':');
+        var host = hostAndPort[0];
+        args.push("--host", host);
+        if (!port && hostAndPort.length >= 2) {
+            var port = hostAndPort[1];
+        }
+    }
+    if (port) {
+        args.push("--port", port);
+    }
+
     // Convert function into call-string
     if (typeof(jsCode) == "function") {
         var id = Math.floor(Math.random() * 100000);
@@ -244,18 +256,6 @@ function startParallelShell( jsCode, port, noConnect ){
 
     args.push("--eval", jsCode);
 
-    if (typeof db == "object") {
-        var hostAndPort = db.getMongo().host.split(':');
-        var host = hostAndPort[0];
-        args.push("--host", host);
-        if (!port && hostAndPort.length >= 2) {
-            var port = hostAndPort[1];
-        }
-    }
-    if (port) {
-        args.push("--port", port);
-    }
-
     x = startMongoProgramNoConnect.apply(null, args);
     return function(){
         return waitProgram( x );