From 98165a23f6af014639b689e4f9aebdcb82757d84 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 6 Feb 2021 23:02:02 -0800 Subject: [PATCH] Clear internal maps of NativeModuleRegistry during turn down of the bridge Summary: This diff clears the internal maps of NativeModuleRegistry during turn down of the bridge. This is necessary for a proper cleanup of these modules. changelog: [internal] internal Reviewed By: ShikaSD Differential Revision: D26239303 fbshipit-source-id: 6e98e5db60a4f54d02e99b03339b03c17ecc183d --- .../main/java/com/facebook/react/bridge/JSIModuleRegistry.java | 1 + .../java/com/facebook/react/bridge/NativeModuleRegistry.java | 1 + 2 files changed, 2 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java index 09d20d6c9a3..a4cdda0b718 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java @@ -44,5 +44,6 @@ public class JSIModuleRegistry { JSIModuleHolder moduleHolder = entry.getValue(); moduleHolder.notifyJSInstanceDestroy(); } + mModules.clear(); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java index e45069d75ad..9400f8e9206 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java @@ -84,6 +84,7 @@ public class NativeModuleRegistry { for (ModuleHolder module : mModules.values()) { module.destroy(); } + mModules.clear(); } finally { Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); }