From d4d5ab0bba4effe84597d6f7a1b5a14b9b9ec5ce Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sun, 18 Aug 2024 16:45:02 -0700 Subject: [PATCH] Fix lint warnings (#46083) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/46083 Fix lint warnings changelog: [internal] internal Reviewed By: tdn120 Differential Revision: D61376258 fbshipit-source-id: e4e047e478a4e5a95d5e6b3dea426189f29bb641 --- .../main/java/com/facebook/react/bridge/DynamicFromMap.java | 3 ++- .../java/com/facebook/react/bridge/DynamicFromObject.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java index e6ad9c4a110..0a183f38af0 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromMap.java @@ -9,6 +9,7 @@ package com.facebook.react.bridge; import androidx.annotation.Nullable; import androidx.core.util.Pools.SimplePool; +import java.util.Objects; /** Implementation of Dynamic wrapping a ReadableMap. */ class DynamicFromMap implements Dynamic { @@ -96,7 +97,7 @@ class DynamicFromMap implements Dynamic { if (mMap == null || mName == null) { throw new IllegalStateException("This dynamic value has been recycled"); } - return mMap.getMap(mName); + return Objects.requireNonNull(mMap.getMap(mName)); } @Override diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java index b0bc88e14c7..226749c5bbd 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DynamicFromObject.java @@ -80,7 +80,10 @@ public class DynamicFromObject implements Dynamic { if (mObject instanceof ReadableArray) { return ReadableType.Array; } - FLog.e(ReactConstants.TAG, "Unmapped object type " + mObject.getClass().getName()); + FLog.e( + ReactConstants.TAG, + "Unmapped object type " + + (mObject == null ? "" : mObject.getClass().getName())); return ReadableType.Null; } }