Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

fix: don't save handleIds for node #736

Merged
merged 1 commit into from
May 3, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions lib/common/timers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,28 @@ export function patchTimer(window: any, setName: string, cancelName: string, nam
try {
task.invoke.apply(this, arguments);
} finally {
delete tasksByHandleId[data.handleId];
if (typeof data.handleId === 'number') {
// Node returns complex objects as handleIds
delete tasksByHandleId[data.handleId];
}
}
};
data.args[0] = timer;
data.handleId = setNative.apply(window, data.args);
tasksByHandleId[data.handleId] = task;
if (typeof data.handleId === 'number') {
// Node returns complex objects as handleIds -> no need to keep them around. Additionally,
// this throws an
// exception in older node versions and has no effect there, because of the stringified key.
tasksByHandleId[data.handleId] = task;
}
return task;
}

function clearTask(task: Task) {
delete tasksByHandleId[(<TimerOptions>task.data).handleId];
if (typeof(<TimerOptions>task.data).handleId === 'number') {
// Node returns complex objects as handleIds
delete tasksByHandleId[(<TimerOptions>task.data).handleId];
}
return clearNative((<TimerOptions>task.data).handleId);
}

Expand Down