Fix assertion when modules are accessed early on in bridge startup

facebook · Aug 26, 2015 · 7bf157c · 7bf157c
1 parent 9ffbfae
commit 7bf157c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m
@@ -407,9 +407,10 @@ - (BOOL)isValid
 
 - (NSDictionary *)modules
 {
-  RCTAssert(!self.isValid || _modulesByName != nil, @"Bridge modules have not yet been initialized. "
-            "You may be trying to access a module too early in the startup procedure.");
-
+  if (RCT_DEBUG && self.isValid && _modulesByName == nil) {
+    RCTLogError(@"Bridge modules have not yet been initialized. You may be "
+                "trying to access a module too early in the startup procedure.");
+  }
   return _modulesByName;
 }
 

diff --git a/React/Base/RCTLog.m b/React/Base/RCTLog.m
@@ -226,7 +226,11 @@ void _RCTLogFormat(
           }
         }
       }];
-      [[RCTBridge currentBridge].redBox showErrorMessage:message withStack:stack];
+      dispatch_async(dispatch_get_main_queue(), ^{
+        // red box is thread safe, but by deferring to main queue we avoid a startup
+        // race condition that causes the module to be accessed before it has loaded
+        [[RCTBridge currentBridge].redBox showErrorMessage:message withStack:stack];
+      });
     }
 
     // Log to JS executor