Skip to content

fix mTimerIdsToTimers remove error #8966

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 2 commits into from
Closed

fix mTimerIdsToTimers remove error #8966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 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
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
5 changes: 2 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/modules/core/Timing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.UiThreadUtil;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.common.MapBuilder;
import com.facebook.react.common.SystemClock;
import com.facebook.react.devsupport.DevSupportManager;
import com.facebook.react.uimanager.ReactChoreographer;
Expand Down Expand Up @@ -105,7 +104,7 @@ public void doFrame(long frameTimeNanos) {
timer.mTargetTime = frameTimeMillis + timer.mInterval;
mTimers.add(timer);
} else {
mTimerIdsToTimers.remove(timer.mCallbackID);
mTimerIdsToTimers.remove(timer.mExecutorToken);
}
}
}
Expand Down Expand Up @@ -386,7 +385,7 @@ public void deleteTimer(ExecutorToken executorToken, int timerId) {
return;
}
// We may have already called/removed it
mTimerIdsToTimers.remove(timerId);
mTimerIdsToTimers.remove(executorToken);
mTimers.remove(timer);
}
}
Expand Down
12 changes: 6 additions & 6 deletions ReactAndroid/src/main/java/com/facebook/react/views/art/ARTRenderableViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ public String getName() {

@Override
public ReactShadowNode createShadowNodeInstance() {
if (mClassName == CLASS_GROUP) {
if (CLASS_GROUP.equals(mClassName)) {
return new ARTGroupShadowNode();
} else if (mClassName == CLASS_SHAPE) {
} else if (CLASS_SHAPE.equals(mClassName)) {
return new ARTShapeShadowNode();
} else if (mClassName == CLASS_TEXT) {
} else if (CLASS_TEXT.equals(mClassName)) {
return new ARTTextShadowNode();
} else {
throw new IllegalStateException("Unexpected type " + mClassName);
Expand All @@ -65,11 +65,11 @@ public ReactShadowNode createShadowNodeInstance() {

@Override
public Class<? extends ReactShadowNode> getShadowNodeClass() {
if (mClassName == CLASS_GROUP) {
if (CLASS_GROUP.equals(mClassName)) {
return ARTGroupShadowNode.class;
} else if (mClassName == CLASS_SHAPE) {
} else if (CLASS_SHAPE.equals(mClassName)) {
return ARTShapeShadowNode.class;
} else if (mClassName == CLASS_TEXT) {
} else if (CLASS_TEXT.equals(mClassName)) {
return ARTTextShadowNode.class;
} else {
throw new IllegalStateException("Unexpected type " + mClassName);
Expand Down