SERVER-17817 Remove inoperative code from client.h/cpp

1 files changed, 3 insertions, 10 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index a893bbeb756..b20dd87d04d 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -50,7 +50,6 @@
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/curop.h"
-#include "mongo/db/dbwebserver.h"
 #include "mongo/db/instance.h"
 #include "mongo/db/json.h"
 #include "mongo/db/lasterror.h"
@@ -113,8 +112,7 @@ namespace mongo {
           _threadId(boost::this_thread::get_id()),
           _connectionId(p ? p->connectionId() : 0),
           _inDirectClient(false),
-          _txn(NULL),
-          _shutdown(false) {
+          _txn(NULL) {
 
         _curOp = new CurOp( this );
     }
@@ -124,8 +122,7 @@ namespace mongo {
             // we can't clean up safely once we're in shutdown
             {
                 boost::lock_guard<boost::mutex> clientLock(clientsMutex);
-                if ( ! _shutdown )
-                    clients.erase(this);
+                clients.erase(this);
             }
 
             CurOp* last;
@@ -138,14 +135,10 @@ namespace mongo {
     }
 
     bool Client::shutdown() {
-        _shutdown = true;
-        if ( inShutdown() )
-            return false;
-        {
+        if (!inShutdown()) {
             boost::lock_guard<boost::mutex> clientLock(clientsMutex);
             clients.erase(this);
         }
-
         return false;
     }