diff options
author | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2019-09-17 16:20:09 -0700 |
---|---|---|
committer | Rich Trott <rtrott@gmail.com> | 2019-09-22 16:19:26 -0700 |
commit | a861b84d5d260d580243741b8e2f1c2b7330a6a2 (patch) | |
tree | 699d9af76d5d0c4e07a5034903cb3dac993e8ca0 /lib | |
parent | ec390b63a1989d5da0ec7043f7e2e91398212877 (diff) | |
download | android-node-v8-a861b84d5d260d580243741b8e2f1c2b7330a6a2.tar.gz android-node-v8-a861b84d5d260d580243741b8e2f1c2b7330a6a2.tar.bz2 android-node-v8-a861b84d5d260d580243741b8e2f1c2b7330a6a2.zip |
timers: set _destroyed even if there are no destroy-hooks
Required for other potential changes.
This should make it so we can always just check _destroyed to
check if a timer has been ended.
PR-URL: https://github.com/nodejs/node/pull/29595
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/internal/timers.js | 2 | ||||
-rw-r--r-- | lib/timers.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/internal/timers.js b/lib/internal/timers.js index 2d86b2203c..bb18881981 100644 --- a/lib/internal/timers.js +++ b/lib/internal/timers.js @@ -544,8 +544,8 @@ function getTimerCallbacks(runNextTicks) { if (destroyHooksExist() && !timer._destroyed) { emitDestroy(timer[async_id_symbol]); - timer._destroyed = true; } + timer._destroyed = true; } } diff --git a/lib/timers.js b/lib/timers.js index 98acbf8fa4..f7fd157b32 100644 --- a/lib/timers.js +++ b/lib/timers.js @@ -65,8 +65,8 @@ function unenroll(item) { item[async_id_symbol] !== undefined && !item._destroyed) { emitDestroy(item[async_id_symbol]); - item._destroyed = true; } + item._destroyed = true; L.remove(item); |