Permalink
Browse files

Fix crash when destroying catalyst

Reviewed By: fromcelticpark

Differential Revision: D6373275

fbshipit-source-id: c36b53f023800097b301d530250b05e5b2a4dfca
  • Loading branch information...
Dmitry Zakharov authored and facebook-github-bot committed Nov 20, 2017
1 parent 0ff5760 commit f1015664e92f02c33417a591a2438db7c0cd3811
@@ -764,8 +764,14 @@ public void detachRootView(ReactRootView rootView) {
}
public @Nullable ViewManager createViewManager(String viewManagerName) {
ReactApplicationContext context =
Assertions.assertNotNull((ReactApplicationContext) getCurrentReactContext());
ReactApplicationContext context;
synchronized (mReactContextLock) {
context = (ReactApplicationContext) getCurrentReactContext();
if (context == null || !context.hasActiveCatalystInstance()) {
return null;
}
}
synchronized (mPackages) {
for (ReactPackage reactPackage : mPackages) {
if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
@@ -781,9 +787,15 @@ public void detachRootView(ReactRootView rootView) {
return null;
}
public List<String> getViewManagerNames() {
ReactApplicationContext context =
Assertions.assertNotNull((ReactApplicationContext) getCurrentReactContext());
public @Nullable List<String> getViewManagerNames() {
ReactApplicationContext context;
synchronized(mReactContextLock) {
context = (ReactApplicationContext) getCurrentReactContext();
if (context == null || !context.hasActiveCatalystInstance()) {
return null;
}
}
synchronized (mPackages) {
Set<String> uniqueNames = new HashSet<>();
for (ReactPackage reactPackage : mPackages) {
@@ -21,7 +21,7 @@
*
* @param loadClasses defines if View Managers classes should be loaded or be avoided.
*/
List<String> getViewManagerNames(ReactApplicationContext reactContext, boolean loadClasses);
@Nullable List<String> getViewManagerNames(ReactApplicationContext reactContext, boolean loadClasses);
/**
* Creates and returns a ViewManager with a specific name {@param viewManagerName}. It's up to an
* implementing package how to interpret the name.

0 comments on commit f101566

Please sign in to comment.