Revert "Fix ReactRootView mount/unmount race condition"

This reverts commit 6524591.
facebook · Nov 9, 2018 · 08b14f4 · 08b14f4
1 parent 53672ef
commit 08b14f4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 91 deletions.
diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK b/ReactAndroid/src/androidTest/java/com/facebook/react/tests/core/BUCK
diff --git a/...tAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactInstanceManagerTest.java b/...tAndroid/src/androidTest/java/com/facebook/react/tests/core/ReactInstanceManagerTest.java
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -732,9 +732,8 @@ public void attachRootView(ReactRootView rootView) {
   @ThreadConfined(UI)
   public void detachRootView(ReactRootView rootView) {
     UiThreadUtil.assertOnUiThread();
-    if (mAttachedRootViews.contains(rootView)) {
+    if (mAttachedRootViews.remove(rootView)) {
       ReactContext currentContext = getCurrentReactContext();
-      mAttachedRootViews.remove(rootView);
       if (currentContext != null && currentContext.hasActiveCatalystInstance()) {
         detachViewFromInstance(rootView, currentContext.getCatalystInstance());
       }
@@ -960,22 +959,22 @@ private void setupReactContext(final ReactApplicationContext reactContext) {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "setupReactContext");
     synchronized (mReactContextLock) {
       mCurrentReactContext = Assertions.assertNotNull(reactContext);
-      CatalystInstance catalystInstance =
-          Assertions.assertNotNull(reactContext.getCatalystInstance());
-
-      catalystInstance.initialize();
-      mDevSupportManager.onNewReactContextCreated(reactContext);
-      mMemoryPressureRouter.addMemoryPressureListener(catalystInstance);
-      moveReactContextToCurrentLifecycleState();
-
-      ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_START);
-      synchronized (mAttachedRootViews) {
-        for (ReactRootView rootView : mAttachedRootViews) {
-          attachRootViewToInstance(rootView);
-        }
+    }
+    CatalystInstance catalystInstance =
+      Assertions.assertNotNull(reactContext.getCatalystInstance());
+
+    catalystInstance.initialize();
+    mDevSupportManager.onNewReactContextCreated(reactContext);
+    mMemoryPressureRouter.addMemoryPressureListener(catalystInstance);
+    moveReactContextToCurrentLifecycleState();
+
+    ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_START);
+    synchronized (mAttachedRootViews) {
+      for (ReactRootView rootView : mAttachedRootViews) {
+        attachRootViewToInstance(rootView);
       }
-      ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_END);
     }
+    ReactMarker.logMarker(ATTACH_MEASURED_ROOT_VIEWS_END);
 
     ReactInstanceEventListener[] listeners =
       new ReactInstanceEventListener[mReactInstanceEventListeners.size()];