Revert "SERVER-18131 Clean up LastError."

This reverts commit 54c25da33ec7270295c8948f6a51376ec4fd278c and
commit c952a9396a1843aa45d6afa3c6785dec607de112.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mongo/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp
index fc076a9f926..822db3b58f4 100644
--- a/src/mongo/dbtests/directclienttests.cpp
+++ b/src/mongo/dbtests/directclienttests.cpp
@@ -33,7 +33,6 @@
 
 #include <iostream>
 
-#include "mongo/db/client.h"
 #include "mongo/db/db.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/json.h"
@@ -50,11 +49,15 @@ namespace DirectClientTests {
     class ClientBase {
     public:
         ClientBase() {
-            mongo::LastError::get(cc()).reset();
+            _prevError = mongo::lastError._get( false );
+            mongo::lastError.release();
+            mongo::lastError.reset( new LastError() );
         }
         virtual ~ClientBase() {
-            mongo::LastError::get(cc()).reset();
+            mongo::lastError.reset( _prevError );
         }
+    private:
+        LastError* _prevError;
     };
 
     const char *ns = "a.b";