diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java index c8b340f7691..3043c74eac2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java @@ -34,7 +34,11 @@ public class Inspector { public static LocalConnection connect(int pageId, RemoteConnection remote) { try { - return instance().connectNative(pageId, remote); + final LocalConnection local = instance().connectNative(pageId, remote); + if (local == null) { + throw new IllegalStateException("Can't open failed connection"); + } + return local; } catch (UnsatisfiedLinkError e) { FLog.e(ReactConstants.TAG, "Inspector doesn't work in open source yet", e); throw new RuntimeException(e); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp index a96bd26ab1b..427b3bb8f7c 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp @@ -95,7 +95,9 @@ jni::local_ref JInspector::connect( jni::alias_ref remote) { auto localConnection = inspector_->connect( pageId, std::make_unique(std::move(remote))); - return JLocalConnection::newObjectCxxArgs(std::move(localConnection)); + return localConnection + ? JLocalConnection::newObjectCxxArgs(std::move(localConnection)) + : nullptr; } void JInspector::registerNatives() {