aboutsummaryrefslogtreecommitdiff
path: root/lib/timers.js
diff options
context:
space:
mode:
authorAnatoli Papirovski <apapirovski@mac.com>2018-02-05 13:09:08 -0500
committerAnatoli Papirovski <apapirovski@mac.com>2018-02-08 09:01:54 -0500
commit8204b0f9c6dbbdba1ca4120698a7f87ca1c9d91c (patch)
treedc3cfb58f418f350c115121d5ede568eadc84ada /lib/timers.js
parentc11cb038a116f1097e4f800b6e4471dafce8a46f (diff)
downloadandroid-node-v8-8204b0f9c6dbbdba1ca4120698a7f87ca1c9d91c.tar.gz
android-node-v8-8204b0f9c6dbbdba1ca4120698a7f87ca1c9d91c.tar.bz2
android-node-v8-8204b0f9c6dbbdba1ca4120698a7f87ca1c9d91c.zip
timers: simplify clearTimeout & clearInterval
Remove unnecessary condition from timeout & interval clearing. PR-URL: https://github.com/nodejs/node/pull/18579 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'lib/timers.js')
-rw-r--r--lib/timers.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/timers.js b/lib/timers.js
index 954c73f602..39a22454ac 100644
--- a/lib/timers.js
+++ b/lib/timers.js
@@ -465,8 +465,8 @@ function rearm(timer, start = TimerWrap.now()) {
const clearTimeout = exports.clearTimeout = function(timer) {
- if (timer && (timer[kOnTimeout] || timer._onTimeout)) {
- timer[kOnTimeout] = timer._onTimeout = null;
+ if (timer && timer._onTimeout) {
+ timer._onTimeout = null;
if (timer instanceof Timeout) {
timer.close(); // for after === 0
} else {