ensure proper conditions for queue.drain(). fixes #668

caolan · Jun 1, 2015 · 10c1d67 · 10c1d67
1 parent 4547ee9
commit 10c1d67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Bug Fixes:
 - `forever` will no longer stack overflow with a synchronous iterator (#622)
 - `eachLimit` and others limit functions will stop iterating once an error occurs (#754)
 - Always pass `null` in callbacks when there is no error (#439)
+- Ensure proper conditions when calling `drain()` after pushing an empty data set to a queue (#668) 
 - Doc fixes (#766)
 
 

diff --git a/lib/async.js b/lib/async.js
@@ -811,7 +811,7 @@
             if (!_isArray(data)) {
                 data = [data];
             }
-            if(data.length === 0) {
+            if(data.length === 0 && q.idle()) {
                 // call drain immediately if there are no tasks
                 return async.setImmediate(function() {
                    q.drain();