1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle null values in clearTimeout

Browse Source
This commit is contained in:
Ryan Dahl 2010-10-29 00:00:43 -07:00
parent fa7dcbec8b
commit 7a48fd8455
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/timers.js
View File

@ -209,9 +209,11 @@ exports.setTimeout = function (callback, after) {
exports.clearTimeout = function (timer) { exports.clearTimeout = function (timer) {
timer.callback = timer._onTimeout = null; if (timer) {
exports.unenroll(timer); timer.callback = timer._onTimeout = null;
if (timer instanceof Timer) timer.stop(); // for after === 0 exports.unenroll(timer);
if (timer instanceof Timer) timer.stop(); // for after === 0
}
}; };

4
test/pummel/test-timers.js
View File

@ -8,6 +8,10 @@ var WINDOW = 200; // why is does this need to be so big?
var interval_count = 0; var interval_count = 0;
var setTimeout_called = false; var setTimeout_called = false;
// check that these don't blow up.
clearTimeout(null);
clearInterval(null);
assert.equal(true, setTimeout instanceof Function); assert.equal(true, setTimeout instanceof Function);
var starttime = new Date; var starttime = new Date;
setTimeout(function () { setTimeout(function () {