SERVER-15062 change redundant branch to invariant

1 files changed, 3 insertions, 14 deletions

diff --git a/src/mongo/db/repl/topology_coordinator_impl.cpp b/src/mongo/db/repl/topology_coordinator_impl.cpp
index 4c85adb4b09..ea2acac0abc 100644
--- a/src/mongo/db/repl/topology_coordinator_impl.cpp
+++ b/src/mongo/db/repl/topology_coordinator_impl.cpp
@@ -569,23 +569,12 @@ namespace {
             response->noteMismatched();
             return;
         }
+        if (_currentConfig.isInitialized()) {
+            invariant(_currentConfig.getReplSetName() == args.getSetName());
+        }
 
         // This is a replica set
         response->noteReplSet();
-
-/*
-        if( cmdObj["checkEmpty"].trueValue() ) {
-            // Eric: XXX takes read lock; only used for initial sync heartbeat
-            resultObj->append("hasData", replHasDatabases());
-        }
-*/
-
-        // Verify that the config's replset name matches
-        if (_currentConfig.getReplSetName() != args.getSetName()) {
-            *result = Status(ErrorCodes::BadValue, "repl set names do not match (2)");
-            response->noteMismatched();
-            return; 
-        }
         response->setSetName(_currentConfig.getReplSetName());
 
         const MemberState myState = getMemberState();