From 98521eb16e7bfd64d4c85c65626f87356a82f2f5 Mon Sep 17 00:00:00 2001
From: Natansh Verma <natansh@fb.com>
Date: Wed, 8 Jul 2015 00:28:54 -0700
Subject: [PATCH] Revert "[ReactNative] Fix RCTJavaScriptContext deallocation"

---
 React/Base/RCTBatchedBridge.m        | 65 ++++++++++++++++++----------
 React/Executors/RCTContextExecutor.m |  1 -
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
index 9b77ad466..b1bb6cf1a 100644
--- a/React/Base/RCTBatchedBridge.m
+++ b/React/Base/RCTBatchedBridge.m
@@ -347,36 +347,53 @@ RCT_NOT_IMPLEMENTED(-initWithBundleURL:(__unused NSURL *)bundleURL
     RCTLatestExecutor = nil;
   }
 
-  [_mainDisplayLink invalidate];
-  _mainDisplayLink = nil;
+  void (^mainThreadInvalidate)(void) = ^{
+    RCTAssertMainThread();
 
-  // Invalidate modules
-  dispatch_group_t group = dispatch_group_create();
-  for (RCTModuleData *moduleData in _modules) {
-    if (moduleData.instance == _javaScriptExecutor) {
-      continue;
-    }
+    [_mainDisplayLink invalidate];
+    _mainDisplayLink = nil;
 
-    if ([moduleData.instance respondsToSelector:@selector(invalidate)]) {
-      [moduleData dispatchBlock:^{
-        [(id<RCTInvalidating>)moduleData.instance invalidate];
-      } dispatchGroup:group];
+    // Invalidate modules
+    dispatch_group_t group = dispatch_group_create();
+    for (RCTModuleData *moduleData in _modules) {
+      if ([moduleData.instance respondsToSelector:@selector(invalidate)]) {
+        [moduleData dispatchBlock:^{
+          [(id<RCTInvalidating>)moduleData.instance invalidate];
+        } dispatchGroup:group];
+      }
+      moduleData.queue = nil;
     }
-    moduleData.queue = nil;
+    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+      _modules = nil;
+      _modulesByName = nil;
+      _frameUpdateObservers = nil;
+    });
+  };
+
+  if (!_javaScriptExecutor) {
+
+    // No JS thread running
+    mainThreadInvalidate();
+    return;
   }
-  dispatch_group_notify(group, dispatch_get_main_queue(), ^{
-    [_javaScriptExecutor executeBlockOnJavaScriptQueue:^{
-      [_jsDisplayLink invalidate];
-      _jsDisplayLink = nil;
 
-      [_javaScriptExecutor invalidate];
-      _javaScriptExecutor = nil;
-    }];
+  [_javaScriptExecutor executeBlockOnJavaScriptQueue:^{
 
-    _modules = nil;
-    _modulesByName = nil;
-    _frameUpdateObservers = nil;
-  });
+    /**
+     * JS Thread deallocations
+     */
+    [_javaScriptExecutor invalidate];
+    _javaScriptExecutor = nil;
+
+    [_jsDisplayLink invalidate];
+    _jsDisplayLink = nil;
+
+    /**
+     * Main Thread deallocations
+     */
+    dispatch_async(dispatch_get_main_queue(), mainThreadInvalidate);
+
+  }];
 }
 
 #pragma mark - RCTBridge methods
diff --git a/React/Executors/RCTContextExecutor.m b/React/Executors/RCTContextExecutor.m
index 0b922d4d0..200a3f645 100644
--- a/React/Executors/RCTContextExecutor.m
+++ b/React/Executors/RCTContextExecutor.m
@@ -320,7 +320,6 @@ static NSError *RCTNSErrorFromJSError(JSContextRef context, JSValueRef jsError)
                    onThread:_javaScriptThread
                  withObject:nil
               waitUntilDone:NO];
-  _context = nil;
 }
 
 - (void)dealloc