fixup: keep trigger timers in their own map

nodejs · Sep 26, 2015 · 9f28c3c · 9f28c3c
1 parent e1ccbad
commit 9f28c3c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/timers.js b/lib/timers.js
@@ -19,6 +19,7 @@ const TIMEOUT_MAX = 2147483647; // 2^31-1
 // key = time in milliseconds
 // value = set
 var lists = {};
+var triggerTimers = new Map();
 
 // the main function - creates lists on demand and the watchers associated
 // with them.
@@ -37,7 +38,7 @@ function insert(item, msecs) {
     timer[kOnTimeout] = listOnTimeout;
 
     lists[msecs] = new Set();
-    lists[msecs].timer = timer;
+    triggerTimers.set(msecs, timer);
   }
 
   lists[msecs].add(item);
@@ -114,8 +115,9 @@ const unenroll = exports.unenroll = function(item) {
 
   // if empty then stop the watcher
   if (list && list.size === 0) {
-    if (list.timer) {
-      list.timer.close();
+    if (triggerTimers.has(item._idleTimeout)) {
+      triggerTimers.get(item._idleTimeout).close();
+      triggerTimers.delete(item._idleTimeout);
     }
     delete lists[item._idleTimeout];
   }