Fix behavior of close; let close also wait for messages in the discon…

…nected queue
MonetDB · Nov 3, 2015 · eab3000 · eab3000
1 parent 686d897
commit eab3000
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Tests/test.js b/Tests/test.js
@@ -248,15 +248,16 @@ describe("#Connection", function() {
 
     it("should finish all its queries when closed", function() {
         var conn = new MDB();
-        return conn.connect().then(function() {
-            var qs = [
-                conn.query("SELECT 1"),
-                conn.query("SELECT 2"),
-                conn.query("SELECT 3")
-            ];
-            conn.close();
-            return Q.all(qs);
-        });
+        conn.connect();
+
+        var qs = [
+            conn.query("SELECT 1"),
+            conn.query("SELECT 2"),
+            conn.query("SELECT 3")
+        ];
+
+        conn.close();
+        return Q.all(qs);
     });
 
     it("should fail all queries on destroyed connection", function() {

diff --git a/src/mapi-connection.js b/src/mapi-connection.js
@@ -46,7 +46,7 @@ module.exports = function MapiConnection(options) {
     function _nextMessage() {
         if (!_messageQueue.length) {
             _msgLoopRunning = false;
-            if (_closeDeferred) {
+            if ((!_messageQueueDisconnected || !_messageQueueDisconnected.length) && _closeDeferred) {
                 self.destroy();
                 _closeDeferred && _closeDeferred.resolve();
             }