better slave handling for SERVER-3462

1 files changed, 3 insertions, 7 deletions

diff --git a/client/dbclient_rs.cpp b/client/dbclient_rs.cpp
index 9eb1bdddf1b..82df069da03 100644
--- a/client/dbclient_rs.cpp
+++ b/client/dbclient_rs.cpp
@@ -511,18 +511,14 @@ namespace mongo {
                 return _slave.get();
             _monitor->notifySlaveFailure( _slaveHost );
             _slaveHost = _monitor->getSlave();
-            _slave.reset();
         } 
         else {
             _slaveHost = h;
         }
-        
-        if ( ! _slave ) {
-            _slave.reset( new DBClientConnection( true , this ) );
-            _slave->connect( _slaveHost );
-            _auth( _slave.get() );
-        }
 
+        _slave.reset( new DBClientConnection( true , this ) );
+        _slave->connect( _slaveHost );
+        _auth( _slave.get() );
         return _slave.get();
     }