timers: fix subsequent enroll calls not working

A bug was introduced in #17704 which meant that subsequent calls to enroll would unset the new _idleTimeout and the enrolled object could never again function as a timer. PR-URL: #19936 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Jeremiah Senkpiel <[email protected]>
nodejs · Apr 17, 2018 · 734eb17 · 734eb17
1 parent 31d6cec
commit 734eb17
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/timers.js b/lib/timers.js
@@ -353,13 +353,14 @@ exports.unenroll = util.deprecate(unenroll,
 // This function does not start the timer, see `active()`.
 // Using existing objects as timers slightly reduces object overhead.
 function enroll(item, msecs) {
-  item._idleTimeout = validateTimerDuration(msecs);
+  msecs = validateTimerDuration(msecs);
 
   // if this item was already in a list somewhere
   // then we should unenroll it from that
   if (item._idleNext) unenroll(item);
 
   L.init(item);
+  item._idleTimeout = msecs;
 }
 
 exports.enroll = util.deprecate(enroll,

diff --git a/test/parallel/test-timers-enroll-second-time.js b/test/parallel/test-timers-enroll-second-time.js
@@ -0,0 +1,16 @@
+'use strict';
+
+const common = require('../common');
+
+const assert = require('assert');
+const timers = require('timers');
+
+const enrollObj = {
+  _onTimeout: common.mustCall(),
+};
+
+timers.enroll(enrollObj, 1);
+assert.strictEqual(enrollObj._idleTimeout, 1);
+timers.enroll(enrollObj, 10);
+assert.strictEqual(enrollObj._idleTimeout, 10);
+timers.active(enrollObj);