diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index adf9a39872e..c372d16e3d1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -329,7 +329,6 @@ public class CatalystInstanceImpl implements CatalystInstance { UiThreadUtil.runOnUiThread(new Runnable() { @Override public void run() { - quitQueuesSynchronous(); mHybridData.resetNative(); // Kill non-UI threads from UI thread. getReactQueueConfiguration().destroy(); @@ -343,8 +342,6 @@ public class CatalystInstanceImpl implements CatalystInstance { Systrace.unregisterListener(mTraceListener); } - private native void quitQueuesSynchronous(); - @Override public boolean isDestroyed() { return mDestroyed; diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index 7991531b083..da393c8369a 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -85,10 +85,9 @@ CatalystInstanceImpl::CatalystInstanceImpl() : instance_(folly::make_unique()) {} CatalystInstanceImpl::~CatalystInstanceImpl() { -} - -void CatalystInstanceImpl::quitQueuesSynchronous() { - moduleMessageQueue_->quitSynchronous(); + if (moduleMessageQueue_ != NULL) { + moduleMessageQueue_->quitSynchronous(); + } if (uiBackgroundMessageQueue_ != NULL) { uiBackgroundMessageQueue_->quitSynchronous(); } @@ -98,7 +97,6 @@ void CatalystInstanceImpl::registerNatives() { registerHybrid({ makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid), makeNativeMethod("initializeBridge", CatalystInstanceImpl::initializeBridge), - makeNativeMethod("quitQueuesSynchronous", CatalystInstanceImpl::quitQueuesSynchronous), makeNativeMethod("jniExtendNativeModules", CatalystInstanceImpl::extendNativeModules), makeNativeMethod("jniSetSourceURL", CatalystInstanceImpl::jniSetSourceURL), makeNativeMethod("jniLoadScriptFromAssets", CatalystInstanceImpl::jniLoadScriptFromAssets), diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index 07596c50f98..63034daa408 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -35,8 +35,6 @@ class CatalystInstanceImpl : public jni::HybridClass { return instance_; } - void quitQueuesSynchronous(); - private: friend HybridBase;