From 8599a62968f404d7ee36297ddff15bb8893b8fe6 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Mon, 3 Dec 2018 10:14:59 -0800 Subject: [PATCH] Fix scheduler setTimeout() re-entrancy check --- packages/scheduler/src/Scheduler.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/scheduler/src/Scheduler.js b/packages/scheduler/src/Scheduler.js index 90e33a70dce..6d310896e18 100644 --- a/packages/scheduler/src/Scheduler.js +++ b/packages/scheduler/src/Scheduler.js @@ -473,9 +473,11 @@ if (globalValue && globalValue._schedMock) { var _callback = null; var _flushCallback = function(didTimeout) { if (_callback !== null) { - var cb = _callback; - _callback = null; - cb(didTimeout); + try { + _callback(didTimeout); + } finally { + _callback = null; + } } }; requestHostCallback = function(cb, ms) {