You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/07 02:24:51 UTC
[1/2] incubator-weex git commit: * [android] use a dom for destroy ,
avoid NPE after component destroyed.
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 6823a132a -> e4e6355ba
* [android] use a dom for destroy , avoid NPE after component destroyed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7af22d39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7af22d39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7af22d39
Branch: refs/heads/0.11-dev
Commit: 7af22d393f0b96ea55d2a3b0f3b9d14803dc6087
Parents: 7706e8a
Author: sospartan <so...@gmail.com>
Authored: Mon Mar 6 16:47:34 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Mon Mar 6 16:47:34 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/dom/ImmutableDomObject.java | 4 ++++
android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 4 ++++
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7af22d39/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
index 045a0b6..146196d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
@@ -208,6 +208,8 @@ import android.support.annotation.NonNull;
import com.taobao.weex.dom.flex.Spacing;
+import static com.taobao.weex.dom.WXDomObject.DESTROYED;
+
/**
* Created by sospartan on 25/10/2016.
*/
@@ -227,4 +229,6 @@ public interface ImmutableDomObject {
@NonNull Spacing getBorder();
Object getExtra();
String getType();
+
+ public final ImmutableDomObject DESTROYED = WXDomObject.DESTROYED;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7af22d39/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
index 6fb4a02..61b26b4 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
@@ -240,6 +240,10 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject
public static final String ROOT = "_root";
public static final String TRANSFORM = "transform";
public static final String TRANSFORM_ORIGIN = "transformOrigin";
+ static final WXDomObject DESTROYED = new WXDomObject();
+ static{
+ DESTROYED.mRef = "_destroyed";
+ }
private AtomicBoolean sDestroy = new AtomicBoolean();
private int mViewPortWidth =750;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7af22d39/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 320a23c..320f33b 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1316,7 +1316,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
getInstance().removeFixedView(view);
}
- mDomObj = null;
+ mDomObj = ImmutableDomObject.DESTROYED;
mIsDestroyed = true;
}
[2/2] incubator-weex git commit: Merge branch
'0.11-dev-fix-getdomojb-nullable' of github.com:sospartan/incubator-weex into
0.11-dev This closes #37
Posted by so...@apache.org.
Merge branch '0.11-dev-fix-getdomojb-nullable' of github.com:sospartan/incubator-weex into 0.11-dev
This closes #37
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e4e6355b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e4e6355b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e4e6355b
Branch: refs/heads/0.11-dev
Commit: e4e6355ba6b862799f30e4feba7247a189acc85f
Parents: 6823a13 7af22d3
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 7 10:19:22 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 7 10:19:22 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/dom/ImmutableDomObject.java | 4 ++++
android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 4 ++++
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e4e6355b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e4e6355b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------