Fix NullPointerException when disaptching events

mdvacca · facebook-github-bot · commit fbeb51ef5133 · 2022-04-12T12:18:14.000-07:00
Summary:
This diff fixes a NullPointerException when disaptching events while the SurfaceMountingManager is being destroyed

changelog: [android] android

Reviewed By: cortinico

Differential Revision: D35559550

fbshipit-source-id: c07f74493384fb1b306338ec1bc8b96f1b6f1f41
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
@@ -1026,13 +1026,14 @@ public View getView(int reactTag) {
   }
 
   private @Nullable ViewState getNullableViewState(int tag) {
-    if (mTagToViewState == null) {
+    ConcurrentHashMap<Integer, ViewState> viewStates = mTagToViewState;
+    if (viewStates == null) {
       return null;
     }
     if (ReactFeatureFlags.enableDelayedViewStateDeletion) {
       mScheduledForDeletionViewStateTags.remove(tag);
     }
-    return mTagToViewState.get(tag);
+    return viewStates.get(tag);
   }
 
   @SuppressWarnings("unchecked") // prevents unchecked conversion warn of the <ViewGroup> type

Original file line number	Diff line number	Diff line change
`@@ -1026,13 +1026,14 @@ public View getView(int reactTag) {`
`1026`	`1026`	`}`
`1027`	`1027`
`1028`	`1028`	`private @Nullable ViewState getNullableViewState(int tag) {`
`1029`		`- if (mTagToViewState == null) {`
	`1029`	`+ ConcurrentHashMap<Integer, ViewState> viewStates = mTagToViewState;`
	`1030`	`+ if (viewStates == null) {`
`1030`	`1031`	`return null;`
`1031`	`1032`	`}`
`1032`	`1033`	`if (ReactFeatureFlags.enableDelayedViewStateDeletion) {`
`1033`	`1034`	`mScheduledForDeletionViewStateTags.remove(tag);`
`1034`	`1035`	`}`
`1035`		`- return mTagToViewState.get(tag);`
	`1036`	`+ return viewStates.get(tag);`
`1036`	`1037`	`}`
`1037`	`1038`
`1038`	`1039`	`@SuppressWarnings("unchecked") // prevents unchecked conversion warn of the <ViewGroup> type`