Merge branch '0.11-dev-bugfix-fix-bounceview-npe' of github.com:sospa…

…rtan/incubator-weex into 0.11-dev This closes #3
alibaba · Mar 2, 2017 · b69669b · b69669b
2 parents dd69c05 + fc6f06d
commit b69669b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BaseBounceView.java
@@ -213,6 +213,7 @@
 import android.widget.FrameLayout;
 
 import com.taobao.weex.common.Constants;
+import com.taobao.weex.dom.ImmutableDomObject;
 import com.taobao.weex.ui.component.WXComponent;
 import com.taobao.weex.ui.view.WXLoadingLayout;
 import com.taobao.weex.ui.view.WXRefreshLayout;
@@ -329,8 +330,9 @@ public void setHeaderView(WXComponent refresh) {
     public void setFooterView(WXComponent loading) {
         setLoadmoreEnable(true);
         if (swipeLayout != null) {
-            if (swipeLayout.getFooterView() != null) {
-                swipeLayout.setLoadingHeight((int) loading.getDomObject().getLayoutHeight());
+            ImmutableDomObject domObject;
+            if (swipeLayout.getFooterView() != null && (domObject = loading.getDomObject()) != null) {
+                swipeLayout.setLoadingHeight((int) domObject.getLayoutHeight());
 
                 String colorStr = (String) loading.getDomObject().getStyles().get(Constants.Name.BACKGROUND_COLOR);
                 String bgColor = WXUtils.getString(colorStr, null);