Merge pull request #42 from xxxifan/master

Avoid NPE while mDataList is null
kaleai · Aug 22, 2016 · 4165f64 · 4165f64
2 parents 17ab711 + 2f0370c
commit 4165f64
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/adapter/src/main/java/kale/adapter/CommonAdapter.java b/adapter/src/main/java/kale/adapter/CommonAdapter.java
@@ -75,7 +75,7 @@ public void onItemRangeRemoved(ObservableList<T> sender, int positionStart, int
 
     @Override
     public int getCount() {
-        return mDataList.size();
+        return mDataList == null ? 0 : mDataList.size();
     }
 
     @Override

diff --git a/adapter/src/main/java/kale/adapter/CommonPagerAdapter.java b/adapter/src/main/java/kale/adapter/CommonPagerAdapter.java
@@ -71,7 +71,7 @@ public void onItemRangeRemoved(ObservableList<T> sender, int positionStart, int
 
     @Override
     public int getCount() {
-        return mDataList.size();
+        return mDataList == null ? 0 : mDataList.size();
     }
 
     @NonNull

diff --git a/adapter/src/main/java/kale/adapter/CommonRcvAdapter.java b/adapter/src/main/java/kale/adapter/CommonRcvAdapter.java
@@ -73,7 +73,7 @@ public void onItemRangeMoved(ObservableList<T> sender, int fromPosition, int toP
 
     @Override
     public int getItemCount() {
-        return mDataList.size();
+        return mDataList == null ? 0 : mDataList.size();
     }
 
     @Override