Fallback to toString when getErrorDescription fails

Summary: Fallback to the previous toString call when `getErrorDescription` fails (for unknown reasons). Reviewed By: mhorowitz Differential Revision: D64693634 fbshipit-source-id: e9fe72663717b3808885457c16577254b8bd995c
facebookincubator · Oct 22, 2024 · d5a9092 · d5a9092
1 parent 89dc482
commit d5a9092
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cxx/fbjni/detail/Exceptions.cpp b/cxx/fbjni/detail/Exceptions.cpp
@@ -425,8 +425,8 @@ local_ref<JThrowable> JniException::getThrowable() const noexcept {
 
 // TODO 6900503: consider making this thread-safe.
 void JniException::populateWhat() const noexcept {
+  ThreadScope ts;
   try {
-    ThreadScope ts;
     static auto exceptionHelperClass =
         findClassStatic("com/facebook/jni/ExceptionHelper");
     static auto getErrorDescriptionMethod =
@@ -436,7 +436,12 @@ void JniException::populateWhat() const noexcept {
                 ->toStdString();
     isMessageExtracted_ = true;
   } catch (...) {
-    what_ = kExceptionMessageFailure;
+    try {
+      what_ = throwable_->toString();
+      isMessageExtracted_ = true;
+    } catch (...) {
+      what_ = kExceptionMessageFailure;
+    }
   }
 }