summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/repl_set_request_votes_args.cpp
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2015-08-07 06:36:44 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2015-08-12 04:22:28 -0400
commit86a3e6352eb27fd2e6115299bcec5103a830fe36 (patch)
tree7f7f42491808e8c487e47a710deb445448d18a58 /src/mongo/db/repl/repl_set_request_votes_args.cpp
parent7bb09c0377f5160857617c38ab07955f8f4b03f6 (diff)
downloadmongo-86a3e6352eb27fd2e6115299bcec5103a830fe36.tar.gz
SERVER-19554 merge ReplSetMetadata and ReplicationMetadata
Diffstat (limited to 'src/mongo/db/repl/repl_set_request_votes_args.cpp')
-rw-r--r--src/mongo/db/repl/repl_set_request_votes_args.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mongo/db/repl/repl_set_request_votes_args.cpp b/src/mongo/db/repl/repl_set_request_votes_args.cpp
index 8a119ff0013..51a049131a2 100644
--- a/src/mongo/db/repl/repl_set_request_votes_args.cpp
+++ b/src/mongo/db/repl/repl_set_request_votes_args.cpp
@@ -91,18 +91,9 @@ Status ReplSetRequestVotesArgs::initialize(const BSONObj& argsObj) {
if (!status.isOK())
return status;
- // extracting the lastCommittedOp is a bit of a process
- BSONObj lastCommittedOp = argsObj[kLastCommittedOpFieldName].Obj();
- Timestamp ts;
- status = bsonExtractTimestampField(lastCommittedOp, kOpTimeFieldName, &ts);
+ status = bsonExtractOpTimeField(argsObj, kLastCommittedOpFieldName, &_lastCommittedOp);
if (!status.isOK())
return status;
- long long term;
- status = bsonExtractIntegerField(lastCommittedOp, kTermFieldName, &term);
- if (!status.isOK())
- return status;
- _lastCommittedOp = OpTime(lastCommittedOp[kOpTimeFieldName].timestamp(),
- lastCommittedOp[kTermFieldName].Long());
return Status::OK();
}