summaryrefslogtreecommitdiff
path: root/src/mongo/s/request.cpp
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2014-07-30 10:45:36 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2014-07-30 10:46:16 -0400
commitdac9ac4a46348a67296b8b3ff11c58e522bd1b0b (patch)
treee91a666d945295c4789376c027742b8e9976ac05 /src/mongo/s/request.cpp
parent6d66597265e158ec16dd31f823f0d474194519e7 (diff)
downloadmongo-dac9ac4a46348a67296b8b3ff11c58e522bd1b0b.tar.gz
SERVER-14268: Improve server message parsing
Diffstat (limited to 'src/mongo/s/request.cpp')
-rw-r--r--src/mongo/s/request.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mongo/s/request.cpp b/src/mongo/s/request.cpp
index 984bfdfabe9..f3d09e191f9 100644
--- a/src/mongo/s/request.cpp
+++ b/src/mongo/s/request.cpp
@@ -53,7 +53,6 @@ namespace mongo {
Request::Request( Message& m, AbstractMessagingPort* p ) :
_m(m) , _d( m ) , _p(p) , _didInit(false) {
- verify( _d.getns() );
_id = _m.header()->id;
_txn.reset(new OperationContextNoop());
@@ -77,16 +76,16 @@ namespace mongo {
// Deprecated, will move to the strategy itself
void Request::reset() {
- if ( _m.operation() == dbKillCursors ) {
+ _m.header()->id = _id;
+ _clientInfo->clearRequestInfo();
+
+ if ( !_d.messageShouldHaveNs()) {
return;
}
uassert( 13644 , "can't use 'local' database through mongos" , ! str::startsWith( getns() , "local." ) );
grid.getDBConfig( getns() );
-
- _m.header()->id = _id;
- _clientInfo->clearRequestInfo();
}
void Request::process( int attempt ) {