fix #1681: null check

wordpress-mobile · Jul 29, 2014 · bcab081 · bcab081
1 parent bfa0757
commit bcab081
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java
@@ -497,8 +497,9 @@ protected void onPostExecute(CommentList comments) {
             }
             mPullToRefreshHelper.setRefreshing(false);
 
-            if (isCancelled())
+            if (isCancelled()) {
                 return;
+            }
 
             mCanLoadMoreComments = (comments != null && comments.size() > 0);
 
@@ -513,7 +514,7 @@ protected void onPostExecute(CommentList comments) {
                         return;
                 }
             }
-            if (comments.size() > 0) {
+            if (comments != null && comments.size() > 0) {
                 getCommentAdapter().loadComments();
             }
         }