summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2015-04-01 22:45:20 -0400
committerRandolph Tan <randolph@10gen.com>2015-04-01 23:38:19 -0400
commit7ecaf439780d60e9e6b316ddf90904bd9a61726d (patch)
tree9acd9e60f4118471f6d11f2a632f828c2992b5a0
parenta8a3994524feb47ceb4d92a5d9ecb25dce277b8c (diff)
downloadmongo-7ecaf439780d60e9e6b316ddf90904bd9a61726d.tar.gz
SERVER-17805 logOp / OperationObserver should always check shardversion
Edit backport for C++03 compatibility
-rw-r--r--src/mongo/db/commands/write_commands/batch_executor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
index 7c6fd37d6bb..59684178f8e 100644
--- a/src/mongo/db/commands/write_commands/batch_executor.cpp
+++ b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -929,7 +929,7 @@ namespace mongo {
ShardedConnectionInfo* info = ShardedConnectionInfo::get(false);
if (info) {
- auto rootRequest = updateItem.getRequest();
+ const BatchedCommandRequest* rootRequest = updateItem.getRequest();
if (!updateItem.getUpdate()->getMulti() &&
rootRequest->isMetadataSet() &&
rootRequest->getMetadata()->isShardVersionSet()) {
@@ -973,7 +973,7 @@ namespace mongo {
ShardedConnectionInfo* info = ShardedConnectionInfo::get(false);
if (info) {
- auto rootRequest = removeItem.getRequest();
+ const BatchedCommandRequest* rootRequest = removeItem.getRequest();
if (removeItem.getDelete()->getLimit() == 1 &&
rootRequest->isMetadataSet() &&
rootRequest->getMetadata()->isShardVersionSet()) {