Merge tag 'upstream/2.0.5'

Upstream version 2.0.5

1 files changed, 1 insertions, 5 deletions

diff --git a/db/repl/rs.cpp b/db/repl/rs.cpp
index 23abc24..9181fe9 100644
--- a/db/repl/rs.cpp
+++ b/db/repl/rs.cpp
@@ -119,8 +119,6 @@ namespace mongo {
         return max;
     }
 
-    const bool closeOnRelinquish = true;
-
     void ReplSetImpl::relinquish() {
         LOG(2) << "replSet attempting to relinquish" << endl;
         if( box.getState().primary() ) {
@@ -129,9 +127,7 @@ namespace mongo {
             
                 log() << "replSet relinquishing primary state" << rsLog;
                 changeState(MemberState::RS_SECONDARY);
-            }
-            
-            if( closeOnRelinquish ) {
+
                 /* close sockets that were talking to us so they don't blithly send many writes that will fail
                    with "not master" (of course client could check result code, but in case they are not)
                 */