SERVER-19059 Mismatch in protocolVersion field

1 files changed, 9 insertions, 9 deletions

diff --git a/src/mongo/db/repl/replica_set_config.cpp b/src/mongo/db/repl/replica_set_config.cpp
index eef500a2328..70bc1156470 100644
--- a/src/mongo/db/repl/replica_set_config.cpp
+++ b/src/mongo/db/repl/replica_set_config.cpp
@@ -132,15 +132,6 @@ Status ReplicaSetConfig::initialize(const BSONObj& cfg) {
     if (!status.isOK())
         return status;
 
-    //
-    // Parse protocol version
-    //
-    BSONElement protocolVersionElement;
-    status = bsonExtractIntegerField(cfg, kProtocolVersionFieldName, &_protocolVersion);
-    if (!status.isOK() && status != ErrorCodes::NoSuchKey) {
-        return status;
-    }
-
     _calculateMajorities();
     _addInternalWriteConcernModes();
     _isInitialized = true;
@@ -246,6 +237,15 @@ Status ReplicaSetConfig::_parseSettingsSubdocument(const BSONObj& settings) {
         }
         _customWriteConcernModes[modeElement.fieldNameStringData()] = pattern;
     }
+
+    //
+    // Parse protocol version
+    //
+    status = bsonExtractIntegerField(settings, kProtocolVersionFieldName, &_protocolVersion);
+    if (!status.isOK() && status != ErrorCodes::NoSuchKey) {
+        return status;
+    }
+
     return Status::OK();
 }