master
M66B 3 months ago
parent 68de841b49
commit 7e30c8beae

@ -129,7 +129,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
this.criteria = criteria;
this.pageSize = pageSize;
if (this.folder != null || server || EntityFolder.INBOX.equals(this.criteria.with_folder_type))
if (this.criteria != null &&
(this.folder != null || server || EntityFolder.INBOX.equals(this.criteria.with_folder_type)))
this.criteria.with_folder_type = null;
}

Loading…
Cancel
Save