Fixed memory leak issue caused by not recognizing undefined correctly…

… as a value in _events, Issue #1059
dennismartensson · Aug 10, 2013 · 8a31908 · 8a31908
1 parent 097fbaa
commit 8a31908
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,8 @@
+1.3.18 2013-08-10
+-----------------
+- Fixed issue when throwing exceptions in MongoClient.connect/Db.open (Issue #1057)
+- Fixed an issue where _events is not cleaned up correctly causing a slow steady memory leak.
+
 1.3.17 2013-08-07
 -----------------
 - Ignore return commands that have no registered callback

diff --git a/docs/sphinx-docs/conf.py b/docs/sphinx-docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.17'
+release = '1.3.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/lib/mongodb/connection/base.js b/lib/mongodb/connection/base.js
@@ -289,8 +289,9 @@ Base.prototype.__executeAllCallbacksWithError = function(err) {
     // Remove the key
     delete this._callBackStore._notReplied[keys[j]];
     // Force cleanup _events, node.js seems to set it as a null value
-    if(this._callBackStore._events != null 
-      && this._callBackStore._events[keys[j]] != null) delete this._callBackStore._events[keys[j]];
+    if(this._callBackStore._events) {
+      delete this._callBackStore._events[keys[j]];
+    }
   }
 }
 
@@ -315,8 +316,9 @@ Base.prototype.__executeAllServerSpecificErrorCallbacks = function(host, port, e
         // Remove the key
         delete this._callBackStore._notReplied[keys[j]];
         // Force cleanup _events, node.js seems to set it as a null value
-        if(this._callBackStore._events != null 
-          && this._callBackStore._events[keys[j]] != null) delete this._callBackStore._events[keys[j]];
+        if(this._callBackStore._events) {
+          delete this._callBackStore._events[keys[j]];
+        } 
       }      
     }
   }
@@ -371,7 +373,9 @@ Base.prototype._callHandler = function(id, document, err) {
     // Remove the listeners
     this._callBackStore.removeAllListeners(id);
     // Force key deletion because it nulling it not deleting in 0.10.X
-    if(this._callBackStore._events && this._callBackStore._events[id] != null) delete this._callBackStore._events[id];
+    if(this._callBackStore._events) {
+      delete this._callBackStore._events[id];
+    }
 
     try {
       // Execute the callback if one was provided
@@ -402,8 +406,9 @@ Base.prototype._removeHandler = function(id) {
   // Remove the callback if it's registered
   this._callBackStore.removeAllListeners(id);
   // Force cleanup _events, node.js seems to set it as a null value
-  if(this._callBackStore._events != null 
-    && this._callBackStore._events[id] != null) delete this._callBackStore._events[id];
+  if(this._callBackStore._events) {
+    delete this._callBackStore._events[id];
+  }
 }
 
 /**

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 { "name" :            "mongodb"
 , "description" :     "A node.js driver for MongoDB"
 , "keywords" :        ["mongodb", "mongo", "driver", "db"]
-, "version" :         "1.3.17"
+, "version" :         "1.3.18"
 , "author" :          "Christian Amor Kvalheim <christkv@gmail.com>"
 , "contributors" :  [ "Aaron Heckmann",
                       "Christoph Pojer",

diff --git a/test/tests/manual_tests/load_testing_end_point.js b/test/tests/manual_tests/load_testing_end_point.js
@@ -10,8 +10,10 @@ var http            = require('http'),
 
 console.log('launching simple mongo application...');
 // var url = "mongodb://localhost:30000,localhost:30001,localhost:30002/foo&readPreference=secondaryPreferred"
-var url = "mongodb://192.168.2.173:30000,192.168.2.173:30001,192.168.2.173:30002/foo&readPreference=secondaryPreferred";
-var writeOptions = {w:3};
+// var url = "mongodb://192.168.2.173:30000,192.168.2.173:30001,192.168.2.173:30002/foo&readPreference=secondaryPreferred";
+var url = "mongodb://localhost:27017/test"
+// var writeOptions = {w:3};
+var writeOptions = {w:1};
 
 // Connect
 MongoClient.connect(url, function(err, db) {