summaryrefslogtreecommitdiff
path: root/lib/timers.js
diff options
context:
space:
mode:
authorhveldstra <h@veldstra.org>2016-11-23 10:57:49 +0000
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-12-14 10:10:22 -0500
commit9f6f0f748c03b41f5ba55d57ad0d3bed49fac888 (patch)
tree938e3b658977d24acb71da5e3903a6763b90abb0 /lib/timers.js
parent75ac1099982b509ca8b9ba63fd88feed1c5141af (diff)
downloadandroid-node-v8-9f6f0f748c03b41f5ba55d57ad0d3bed49fac888.tar.gz
android-node-v8-9f6f0f748c03b41f5ba55d57ad0d3bed49fac888.tar.bz2
android-node-v8-9f6f0f748c03b41f5ba55d57ad0d3bed49fac888.zip
timers: fix handling of cleared immediates
If current immediate has no callback, move on to the next one in the queue. Fixes: https://github.com/nodejs/node/issues/9756 PR-URL: https://github.com/nodejs/node/pull/9759 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'lib/timers.js')
-rw-r--r--lib/timers.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/timers.js b/lib/timers.js
index a55e265f29..6d456da36f 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -580,8 +580,10 @@ function processImmediate() {
while (immediate) {
domain = immediate.domain;
- if (!immediate._onImmediate)
+ if (!immediate._onImmediate) {
+ immediate = immediate._idleNext;
continue;
+ }
if (domain)
domain.enter();