You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/12 06:35:11 UTC
[08/12] incubator-weex git commit: [android] NPE protection. break
change of WXFrameLayout, adding a new Interface.
[android] NPE protection. break change of WXFrameLayout, adding a new Interface.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/14fe09c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/14fe09c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/14fe09c0
Branch: refs/heads/0.12-dev
Commit: 14fe09c022179c72c83223ecb5538c9bcb07562a
Parents: 1021fd4
Author: \u884c\u4e45 <yi...@alibaba-inc.com>
Authored: Mon Apr 10 17:38:51 2017 +0800
Committer: \u884c\u4e45 <yi...@alibaba-inc.com>
Committed: Mon Apr 10 17:38:51 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java | 2 +-
android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java | 2 +-
android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/14fe09c0/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
index 40a445f..32654b5 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java
@@ -259,6 +259,6 @@ public class WXFrameLayout extends FrameLayout implements WXGestureObservable,IR
@Nullable
@Override
public WXDiv getComponent() {
- return mWeakReference.get();
+ return null != mWeakReference ? mWeakReference.get() : null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/14fe09c0/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
index 0f45ec2..7a9dbec 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXImageView.java
@@ -310,7 +310,7 @@ public class WXImageView extends ImageView implements WXGestureObservable,
@Nullable
@Override
public WXImage getComponent() {
- return mWeakReference.get();
+ return null != mWeakReference ? mWeakReference.get() : null;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/14fe09c0/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
index 68564da..5e7be97 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXTextView.java
@@ -302,6 +302,6 @@ public class WXTextView extends View implements WXGestureObservable, IWXTextView
@Nullable
@Override
public WXText getComponent() {
- return mWeakReference.get();
+ return null != mWeakReference ? mWeakReference.get() : null;
}
}