Always lock ScopedConn before returning SERVER-4714

1 files changed, 9 insertions, 3 deletions

diff --git a/db/repl/connections.h b/db/repl/connections.h
index 3e08f80b047..3ada71cdb1e 100644
--- a/db/repl/connections.h
+++ b/db/repl/connections.h
@@ -116,12 +116,18 @@ namespace mongo {
             }
         }
 
-        // Keep trying to connect if we're not yet connected
-        if( !first && x->connected ) {
-            connLock.reset( new scoped_lock(x->z) );
+        // already locked connLock above
+        if (first) {
+            connect();
             return;
         }
 
+        connLock.reset( new scoped_lock(x->z) );
+        if (x->connected) {
+            return;
+        }
+
+        // Keep trying to connect if we're not yet connected
         connect();
     }