fix(core): fix android scope null when init engine exception

Tencent · Jan 8, 2025 · a2aab0f · a2aab0f
1 parent 7676518
commit a2aab0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/framework/android/connector/driver/js/src/main/cpp/src/js_driver_jni.cc b/framework/android/connector/driver/js/src/main/cpp/src/js_driver_jni.cc
@@ -412,6 +412,9 @@ void DestroyJsDriver(__unused JNIEnv* j_env,
     scope_cv_map.erase(scope_id);
   }
   auto scope = GetScope(j_scope_id);
+  if (!scope) {
+    return;
+  }
   auto engine = scope->GetEngine().lock();
   FOOTSTONE_CHECK(engine);
   {

diff --git a/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java b/framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java
@@ -720,6 +720,7 @@ private synchronized void restartEngineInBackground(boolean onReLoad) {
         try {
             mEngineContext = new HippyEngineContextImpl(domManager);
         } catch (RuntimeException e) {
+            mEngineContext = null;
             LogUtils.e(TAG, "new HippyEngineContextImpl(): " + e.getMessage());
             notifyEngineInitialized(EngineInitStatus.STATUS_INIT_EXCEPTION, e);
             return;