bugfix ios 8.11.1 multithreading crash by eagle destroy instance

apache · Sep 16, 2019 · 263521e · 263521e
1 parent 8a6c6fa
commit 263521e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -792,26 +792,7 @@ - (void)destroyInstance:(NSString *)instance
     }
 
     WXSDKInstance *sdkInstance = [WXSDKManager instanceForID:instance];
-    if (sdkInstance.dataRender) {
-        if (_dataRenderHandler) {
-            WXPerformBlockOnComponentThread(^{
-                [_dataRenderHandler destroyDataRenderInstance:instance];
-                WXPerformBlockOnBridgeThreadForInstance(^{
-                    [self callJSMethod:@"destroyInstance" args:@[instance]];
-                }, instance);
-            });
-        }
-        else {
-            WXComponentManager *manager = sdkInstance.componentManager;
-            if (manager.isValid) {
-                WXSDKErrCode errorCode = WX_KEY_EXCEPTION_DEGRADE_EAGLE_RENDER_ERROR;
-                NSError *error = [NSError errorWithDomain:WX_ERROR_DOMAIN code:errorCode userInfo:@{@"message":@"No data render handler found!"}];
-                WXPerformBlockOnComponentThread(^{
-                    [manager renderFailed:error];
-                });
-            }
-        }
-    } else {
+    if (!sdkInstance.wlasmRender) {
         [self callJSMethod:@"destroyInstance" args:@[instance]];
     }
 }

diff --git a/weex-playground b/weex-playground
diff --git a/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp b/weex_core/Source/core/bridge/platform/core_side_in_platform.cpp
@@ -55,6 +55,10 @@ void CoreSideInPlatform::SetDefaultHeightAndWidthIntoRootDom(
 }
 
 void CoreSideInPlatform::OnInstanceClose(const std::string &instance_id) {
+  auto handler = EagleBridge::GetInstance()->data_render_handler();
+  if (handler) {
+    handler->DestroyInstance(instance_id.c_str());
+  }
   RenderManager::GetInstance()->ClosePage(instance_id);
 }