Skip to content

Commit

Permalink
Add extra logging in the Bridge exception handling
Browse files Browse the repository at this point in the history
Summary:
This diff adds extra logging in the method that handles exceptions for RN Android
Changelog: internal

Reviewed By: JoshuaGross

Differential Revision: D18694123

fbshipit-source-id: e275445b65473ed55eec9d4b823938e32fa805e5
  • Loading branch information
mdvacca authored and facebook-github-bot committed Nov 27, 2019
1 parent 3e06557 commit 4ad852c
Showing 1 changed file with 17 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
import android.os.Bundle;
import android.view.LayoutInflater;
import androidx.annotation.Nullable;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.infer.annotation.ThreadConfined;
import com.facebook.react.bridge.queue.MessageQueueThread;
import com.facebook.react.bridge.queue.ReactQueueConfiguration;
import com.facebook.react.common.LifecycleState;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.config.ReactFeatureFlags;
import java.lang.ref.WeakReference;
import java.util.concurrent.CopyOnWriteArraySet;
Expand Down Expand Up @@ -359,11 +361,23 @@ public void runOnJSQueueThread(Runnable runnable) {
* otherwise.
*/
public void handleException(Exception e) {
if (mCatalystInstance != null
&& !mCatalystInstance.isDestroyed()
&& mNativeModuleCallExceptionHandler != null) {
boolean catalystInstanceVariableExists = mCatalystInstance != null;
boolean isCatalystInstanceAlive =
catalystInstanceVariableExists && !mCatalystInstance.isDestroyed();
boolean hasExceptionHandler = mNativeModuleCallExceptionHandler != null;

if (isCatalystInstanceAlive && hasExceptionHandler) {
mNativeModuleCallExceptionHandler.handleException(e);
} else {
FLog.e(
ReactConstants.TAG,
"Unable to handle Exception - catalystInstanceVariableExists: "
+ catalystInstanceVariableExists
+ " - isCatalystInstanceAlive: "
+ !isCatalystInstanceAlive
+ " - hasExceptionHandler: "
+ hasExceptionHandler,
e);
throw new RuntimeException(e);
}
}
Expand Down

0 comments on commit 4ad852c

Please sign in to comment.