Skip to content

fix NullPointerException Caused by manageChildren #8991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

fix NullPointerException Caused by manageChildren #8991

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf438e9
fix mTimerIdsToTimers remove error
ASCE1885 Jul 22, 2016
1000f39
fix String comparison using '==' instead of 'equals()'
ASCE1885 Jul 22, 2016
5dbcbae
Merge pull request #1 from facebook/master
ASCE1885 Jul 24, 2016
cf8df7d
fix NullPointerException Caused by manageChildren
Jul 24, 2016
664e4a8
@Nullable should be @Nonnull
Jul 24, 2016
a427396
Inefficient use of keySet iterator instead of entrySet iterator
Jul 24, 2016
9a77241
Merge branch 'master' into master
ASCE1885 Jul 25, 2016
41ec67c
Revert "@Nullable should be @Nonnull"
ASCE1885 Jul 25, 2016
d787048
Revert "Inefficient use of keySet iterator instead of entrySet iterator"
ASCE1885 Jul 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@

package com.facebook.react.uimanager;

import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;

import android.content.res.Resources;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
Expand Down Expand Up @@ -39,6 +36,9 @@
import com.facebook.systrace.Systrace;
import com.facebook.systrace.SystraceMessage;

import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;

/**
* Delegate of {@link UIManagerModule} that owns the native view hierarchy and mapping between
* native view names used in JS and corresponding instances of {@link ViewManager}. The
Expand Down Expand Up @@ -232,17 +232,20 @@ private static String constructManageChildrenErrorMessage(
@Nullable int[] tagsToDelete) {
StringBuilder stringBuilder = new StringBuilder();

stringBuilder.append("View tag:" + viewToManage.getId() + "\n");
stringBuilder.append(" children(" + viewManager.getChildCount(viewToManage) + "): [\n");
for (int index=0; index<viewManager.getChildCount(viewToManage); index+=16) {
for (int innerOffset=0;
((index+innerOffset) < viewManager.getChildCount(viewToManage)) && innerOffset < 16;
innerOffset++) {
stringBuilder.append(viewManager.getChildAt(viewToManage, index+innerOffset).getId() + ",");
if (null != viewToManage) {
stringBuilder.append("View tag:" + viewToManage.getId() + "\n");
stringBuilder.append(" children(" + viewManager.getChildCount(viewToManage) + "): [\n");
for (int index=0; index<viewManager.getChildCount(viewToManage); index+=16) {
for (int innerOffset=0;
((index+innerOffset) < viewManager.getChildCount(viewToManage)) && innerOffset < 16;
innerOffset++) {
stringBuilder.append(viewManager.getChildAt(viewToManage, index+innerOffset).getId() + ",");
}
stringBuilder.append("\n");
}
stringBuilder.append("\n");
stringBuilder.append(" ],\n");
}
stringBuilder.append(" ],\n");

if (indicesToRemove != null) {
stringBuilder.append(" indicesToRemove(" + indicesToRemove.length + "): [\n");
for (int index = 0; index < indicesToRemove.length; index += 16) {
Expand Down