Merge pull request #1 from whatleo/fix-fbjni-crash

[fix] fixed libfbjni.so crash when Instance is destoryed
whatleo · Aug 19, 2022 · 171adb2 · 171adb2
2 parents d3b5cb0 + 90844d7
commit 171adb2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -392,15 +392,17 @@ public void run() {
                                           public void run() {
                                             // Kill non-UI threads from neutral third party
                                             // potentially expensive, so don't run on UI thread
+
+                                            // fixed libfbjni.so crash when Instance is destroyed
+                                            getReactQueueConfiguration().destroy();
 
                                             // contextHolder is used as a lock to guard against
                                             // other users of the JS VM having the VM destroyed
                                             // underneath them, so notify them before we reset
-                                            // Native
+                                            // Native                                            
                                             mJavaScriptContextHolder.clear();
-
                                             mHybridData.resetNative();
-                                            getReactQueueConfiguration().destroy();
+
                                             FLog.d(
                                                 ReactConstants.TAG,
                                                 "CatalystInstanceImpl.destroy() end");