summaryrefslogtreecommitdiff
path: root/src/mongo/db/dbdirectclient.cpp
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2015-04-20 18:51:35 -0400
committerAndy Schwerin <schwerin@mongodb.com>2015-04-29 11:55:38 -0400
commitda31be34dc6664d76868543e9ccdaecad4f504c6 (patch)
treecca380d1419bffe8371f24f73fca169a042b87e1 /src/mongo/db/dbdirectclient.cpp
parentbdbe140e3cc502a58d50a8ec472bd9c05cf12e4f (diff)
downloadmongo-da31be34dc6664d76868543e9ccdaecad4f504c6.tar.gz
SERVER-18131 Clean up LastError.
Makes LastError a decoration on Client. Removes behavior that was specific to the dbKillCursors wire protocol message into the processing for that message, and out of last error. Simplifies lifetime of LastError. It always exists on Clients, so there's no checking for its existence, and no passing it around through parts of the networking library.
Diffstat (limited to 'src/mongo/db/dbdirectclient.cpp')
-rw-r--r--src/mongo/db/dbdirectclient.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mongo/db/dbdirectclient.cpp b/src/mongo/db/dbdirectclient.cpp
index 41b75377060..3aee1750172 100644
--- a/src/mongo/db/dbdirectclient.cpp
+++ b/src/mongo/db/dbdirectclient.cpp
@@ -33,6 +33,7 @@
#include "mongo/db/client.h"
#include "mongo/db/commands.h"
#include "mongo/db/instance.h"
+#include "mongo/db/lasterror.h"
#include "mongo/db/operation_context.h"
#include "mongo/util/log.h"
@@ -122,9 +123,7 @@ namespace mongo {
bool assertOk,
string* actualServer) {
DirectClientScope directClientScope(_txn);
- if (lastError._get()) {
- lastError.startRequest(toSend, lastError._get());
- }
+ LastError::get(_txn->getClient()).startRequest();
DbResponse dbResponse;
assembleResponse(_txn, toSend, dbResponse, dummyHost);
@@ -139,9 +138,7 @@ namespace mongo {
void DBDirectClient::say(Message& toSend, bool isRetry, string* actualServer) {
DirectClientScope directClientScope(_txn);
- if (lastError._get()) {
- lastError.startRequest(toSend, lastError._get());
- }
+ LastError::get(_txn->getClient()).startRequest();
DbResponse dbResponse;
assembleResponse(_txn, toSend, dbResponse, dummyHost);