From 95a43f3366ae14234cab20338d1b60199217dd86 Mon Sep 17 00:00:00 2001 From: Joshua Gross Date: Sat, 19 Oct 2019 02:27:35 -0700 Subject: [PATCH] Set `mCatalystInstance` to null when destroying ReactContext Summary: We want ReactContext to blow up if it tries to use `mCatalystInstance` after `destroy` is called. Changelog: [[Internal]] Reviewed By: mdvacca Differential Revision: D17944723 fbshipit-source-id: cfe8a8b98473f53dd68bbcd91a71f58bd7a0c503 --- .../src/main/java/com/facebook/react/bridge/ReactContext.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java index ee1023ef555..0fb3a8ec794 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -272,6 +272,7 @@ public class ReactContext extends ContextWrapper { if (mCatalystInstance != null) { mCatalystInstance.destroy(); + mCatalystInstance = null; } }