Repository: incubator-weex Updated Branches: refs/heads/master 14aec0d76 -> 6149d49d7
Revert "* [Android] Fix potential memory leak." This reverts commit 361df72 and fix memory leak by make instanceWrap not global (cherry picked from commit 07f8250) Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6149d49d Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6149d49d Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6149d49d Branch: refs/heads/master Commit: 6149d49d70409faacad25e4759a564446c290838 Parents: 14aec0d Author: YorkShen <shenyua...@gmail.com> Authored: Fri Jun 29 14:46:36 2018 +0800 Committer: YorkShen <shenyua...@gmail.com> Committed: Fri Jun 29 15:15:50 2018 +0800 ---------------------------------------------------------------------- android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java | 2 +- .../sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6149d49d/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java index b86de3d..b7f7df6 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java @@ -326,7 +326,7 @@ public class WXSDKEngine implements Serializable { registerComponent(WXBasicComponentType.HEADER, WXHeader.class); registerModule("modal", WXModalUIModule.class, false); - registerModule("instanceWrap", WXInstanceWrap.class, true); + registerModule("instanceWrap", WXInstanceWrap.class, false); registerModule("animation", WXAnimationModule.class, true); registerModule("webview", WXWebViewModule.class, true); registerModule("navigator", WXNavigatorModule.class); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6149d49d/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java index 83aa0b0..c13a442 100644 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXModuleManager.java @@ -30,7 +30,6 @@ import com.taobao.weex.adapter.IWXUserTrackAdapter; import com.taobao.weex.common.Destroyable; import com.taobao.weex.common.WXErrorCode; import com.taobao.weex.common.WXException; -import com.taobao.weex.common.WXInstanceWrap; import com.taobao.weex.common.WXModule; import com.taobao.weex.ui.config.ConfigModuleFactory; import com.taobao.weex.ui.module.WXDomModule; @@ -184,7 +183,7 @@ public class WXModuleManager { WXLogUtils.e("callModuleMethod >>> invoke module:" + moduleStr + ", method:" + methodStr + " failed. ", e); return null; } finally { - if (wxModule instanceof WXDomModule || wxModule instanceof WXTimerModule || wxModule instanceof WXInstanceWrap) { + if (wxModule instanceof WXDomModule || wxModule instanceof WXTimerModule) { wxModule.mWXSDKInstance = null; } }