fix ScopedDBCOnnectionleak SERVER-1077

Conflicts:

	client/connpool.h

2 files changed, 8 insertions, 4 deletions

diff --git a/client/connpool.cpp b/client/connpool.cpp
index d69c78741f3..5a084831216 100644
--- a/client/connpool.cpp
+++ b/client/connpool.cpp
@@ -115,9 +115,11 @@ namespace mongo {
     }
 
     ScopedDbConnection::~ScopedDbConnection() {
-        if ( _conn && ! _conn->isFailed() ) {
-            /* see done() comments above for why we log this line */
-            log() << "~ScopedDBConnection: _conn != null" << endl;
+        if ( _conn ){
+            if ( ! _conn->isFailed() ) {
+                /* see done() comments above for why we log this line */
+                log() << "~ScopedDBConnection: _conn != null" << endl;
+            }
             kill();
         }
     }
diff --git a/client/connpool.h b/client/connpool.h
index 5a47b01b798..b44ff518fd7 100644
--- a/client/connpool.h
+++ b/client/connpool.h
@@ -61,8 +61,10 @@ namespace mongo {
         void flush();
         DBClientBase *get(const string& host);
         void release(const string& host, DBClientBase *c) {
-            if ( c->isFailed() )
+            if ( c->isFailed() ){
+                delete c;
                 return;
+            }
             scoped_lock L(poolMutex);
             pools[host]->pool.push(c);
         }