fix SlaveOk getMore with replica sets for non sharded collections SERVER-2482

1 files changed, 4 insertions, 2 deletions

diff --git a/s/strategy.cpp b/s/strategy.cpp
index d562507bc65..7c1fb0bff33 100644
--- a/s/strategy.cpp
+++ b/s/strategy.cpp
@@ -49,8 +49,10 @@ namespace mongo {
         ShardConnection dbcon( shard , r.getns() );
         DBClientBase &c = dbcon.conn();
 
+        string actualServer;
+
         Message response;
-        bool ok = c.call( r.m(), response);
+        bool ok = c.call( r.m(), response, true , &actualServer );
         uassert( 10200 , "mongos: error calling db", ok );
 
         {
@@ -61,7 +63,7 @@ namespace mongo {
             }
         }
 
-        r.reply( response , c.getServerAddress() );
+        r.reply( response , actualServer.size() ? actualServer : c.getServerAddress() );
         dbcon.done();
     }