You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/24 11:11:25 UTC
incubator-weex git commit: * [android] fix NPE on empty param
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 1584c8816 -> 83eb2746d
* [android] fix NPE on empty param
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/83eb2746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/83eb2746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/83eb2746
Branch: refs/heads/0.16-dev
Commit: 83eb2746de2330e942f70727deea83dfa51edf9a
Parents: 1584c88
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 24 19:09:45 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 24 19:09:45 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/ui/component/WXText.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/83eb2746/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
index 2d78563..59e81fb 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXText.java
@@ -117,7 +117,9 @@ public class WXText extends WXComponent<WXTextView> {
case Constants.Name.VALUE:
return true;
case Constants.Name.FONT_FAMILY:
- registerTypefaceObserver(param.toString());
+ if (param != null) {
+ registerTypefaceObserver(param.toString());
+ }
return true;
default:
return super.setProperty(key, param);