* [android] fix invaild add dom operation

alibaba · Aug 17, 2016 · 7b1ad97 · 7b1ad97
1 parent 288a5fa
commit 7b1ad97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomStatement.java
@@ -646,6 +646,10 @@ void addDom(JSONObject dom, final String parentRef, final int index) {
 
     //Create component in dom thread
     final WXComponent component = mWXRenderManager.createComponentOnDomThread(mInstanceId, domObject, parentRef, index);
+    if(component == null){
+      //stop redner, some fatal happened.
+      return;
+    }
     AddDomInfo addDomInfo = new AddDomInfo();
     addDomInfo.component = component;
     mAddDom.put(domObject.getRef(), addDomInfo);

diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderManager.java
@@ -343,7 +343,7 @@ public void addComponent(String instanceId, WXDomObject dom, String parentRef, i
     statement.addComponent(dom, parentRef, index);
   }
 
-  public WXComponent createComponentOnDomThread(String instanceId, WXDomObject dom, String parentRef, int index) {
+  public @Nullable WXComponent createComponentOnDomThread(String instanceId, WXDomObject dom, String parentRef, int index) {
     WXRenderStatement statement = mRegistries.get(instanceId);
     if (statement == null) {
       return null;

diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java b/android/sdk/src/main/java/com/taobao/weex/ui/WXRenderStatement.java
@@ -364,7 +364,11 @@ void addComponent(WXDomObject dom, String parentRef, int index) {
     parent.addChild(component, index);
   }
 
-  WXComponent createComponentOnDomThread(WXDomObject dom, String parentRef, int index) {
+  @Nullable WXComponent createComponentOnDomThread(WXDomObject dom, String parentRef, int index) {
+    WXComponent comp = mRegistry.get(parentRef);
+    if(comp == null || !(comp instanceof WXVContainer)){
+      return null;
+    }
     return generateComponentTree(dom, (WXVContainer) mRegistry.get(parentRef));
   }