diff options
| author | David Storch <david.storch@10gen.com> | 2015-02-06 10:37:48 -0500 |
|---|---|---|
| committer | David Storch <david.storch@10gen.com> | 2015-02-09 16:48:21 -0500 |
| commit | 570951951f752d1a31bb9e7f0d4276c1b533f25e (patch) | |
| tree | bee30d476893c24992d6214b780796bc1e75a4a7 /src/mongo/db/ops/update_result.cpp | |
| parent | e6e989f7fcf70d5bf5a5645b6927ac7a889dd5b7 (diff) | |
| download | mongo-570951951f752d1a31bb9e7f0d4276c1b533f25e.tar.gz | |
SERVER-17198 prevent invalid logOp rollback in findAndModify
Diffstat (limited to 'src/mongo/db/ops/update_result.cpp')
| -rw-r--r-- | src/mongo/db/ops/update_result.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/ops/update_result.cpp b/src/mongo/db/ops/update_result.cpp index f5e31c1a3d8..d2664d34e38 100644 --- a/src/mongo/db/ops/update_result.cpp +++ b/src/mongo/db/ops/update_result.cpp @@ -42,11 +42,13 @@ namespace mongo { bool modifiers_, unsigned long long numDocsModified_, unsigned long long numMatched_, - const BSONObj& upsertedObject_) + const BSONObj& upsertedObject_, + const BSONObj& newObj_) : existing(existing_), modifiers(modifiers_), numDocsModified(numDocsModified_), - numMatched(numMatched_) { + numMatched(numMatched_), + newObj(newObj_) { BSONElement id = upsertedObject_["_id"]; if ( ! existing && numMatched == 1 && !id.eoo() ) { |