Skip to content

Commit 772c9eb

Browse files
javachefacebook-github-bot
authored andcommitted
Remove unused mapException methods (#38042)
Summary: Pull Request resolved: #38042 Follow-up cleanup from D34379950, now that fbjni has been upgraded. Also synced the internal and external build flags. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D46975010 fbshipit-source-id: 7d2fd215b68bcebbf259e23923fb3fec1ca09f8a
1 parent e6502d8 commit 772c9eb

File tree

5 files changed

+0
-19
lines changed

5 files changed

+0
-19
lines changed

packages/react-native/ReactAndroid/src/main/jni/react/jni/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ file(GLOB reactnativejni_SRC CONFIGURE_DEPENDS *.cpp)
1010

1111
add_compile_options(
1212
-fexceptions
13-
-frtti
1413
-Wno-unused-lambda-capture
1514
-std=c++17
1615
-DWITH_INSPECTOR=1)

packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ using namespace facebook::jni;
1313

1414
namespace facebook::react {
1515

16-
// TODO T112842309: Remove after fbjni upgraded in OSS
17-
void ReadableNativeArray::mapException(const std::exception &ex) {
18-
if (dynamic_cast<const folly::TypeError *>(&ex) != nullptr) {
19-
throwNewJavaException(
20-
exceptions::gUnexpectedNativeTypeExceptionClass, ex.what());
21-
}
22-
}
23-
2416
void ReadableNativeArray::mapException(std::exception_ptr ex) {
2517
try {
2618
std::rethrow_exception(ex);

packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class ReadableNativeArray
3232
static constexpr const char *kJavaDescriptor =
3333
"Lcom/facebook/react/bridge/ReadableNativeArray;";
3434

35-
static void mapException(const std::exception &ex);
3635
static void mapException(std::exception_ptr ex);
3736
static void registerNatives();
3837

packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ using namespace facebook::jni;
1111

1212
namespace facebook::react {
1313

14-
// TODO T112842309: Remove after fbjni upgraded in OSS
15-
void ReadableNativeMap::mapException(const std::exception &ex) {
16-
if (dynamic_cast<const folly::TypeError *>(&ex) != nullptr) {
17-
throwNewJavaException(
18-
exceptions::gUnexpectedNativeTypeExceptionClass, ex.what());
19-
}
20-
}
21-
2214
void ReadableNativeMap::mapException(std::exception_ptr ex) {
2315
try {
2416
std::rethrow_exception(ex);

packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ struct ReadableNativeMap : jni::HybridClass<ReadableNativeMap, NativeMap> {
4040
std::optional<folly::dynamic> keys_;
4141
static jni::local_ref<jhybridobject> createWithContents(folly::dynamic &&map);
4242

43-
static void mapException(const std::exception &ex);
4443
static void mapException(std::exception_ptr ex);
4544
static void registerNatives();
4645

0 commit comments

Comments
 (0)