diff --git a/lib/internal/eachOfLimit.js b/lib/internal/eachOfLimit.js index da46fa45c..0a1f5bc6e 100644 --- a/lib/internal/eachOfLimit.js +++ b/lib/internal/eachOfLimit.js @@ -15,6 +15,7 @@ export default function _eachOfLimit(limit) { var nextElem = iterator(obj); var done = false; var running = 0; + var looping = false; function iterateeCallback(err, value) { running -= 1; @@ -26,12 +27,13 @@ export default function _eachOfLimit(limit) { done = true; return callback(null); } - else { + else if (!looping) { replenish(); } } function replenish () { + looping = true; while (running < limit && !done) { var elem = nextElem(); if (elem === null) { @@ -44,6 +46,7 @@ export default function _eachOfLimit(limit) { running += 1; iteratee(elem.value, elem.key, onlyOnce(iterateeCallback)); } + looping = false; } replenish(); diff --git a/mocha_test/eachOf.js b/mocha_test/eachOf.js index 925f99584..a6c6864d2 100644 --- a/mocha_test/eachOf.js +++ b/mocha_test/eachOf.js @@ -274,6 +274,18 @@ describe("eachOf", function() { setTimeout(done, 25); }); + it('forEachOfLimit 1024 * 1024 synchronous call', function(done) { + var count = 0; + async.forEachOfLimit(_.range(1024 * 1024), Infinity, function(x, i, callback){ + count++; + callback(); + }, function(err){ + if (err) throw err; + expect(count).to.equal(1024 * 1024); + }); + setTimeout(done, 25); + }); + it('forEachOfLimit error', function(done) { var obj = { a: 1, b: 2, c: 3, d: 4, e: 5 }; var call_order = [];