Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when destroying catalyst

Browse Source 
Reviewed By: fromcelticpark

Differential Revision: D6373275

fbshipit-source-id: c36b53f023800097b301d530250b05e5b2a4dfca
This commit is contained in:
Dmitry Zakharov
2017-11-20 07:38:53 -08:00
committed by Facebook Github Bot
parent 0ff576081b
commit f1015664e9
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+17 -5
View File
@@ -764,8 +764,14 @@ public class ReactInstanceManager {
}
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 class ReactInstanceManager {
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) {
ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.java
+1 -1
View File
@@ -21,7 +21,7 @@ public interface ViewManagerOnDemandReactPackage {
*
* @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.