From 0d2e72cf29b67c0f0e0d6eb2cc23b16b65b28742 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 10 Jul 2020 07:37:49 +0200
Subject: [PATCH] OO-4798: filters passed to user data source can be null
sometimes
---
.../org/olat/user/ui/admin/UserSearchDataSource.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/user/ui/admin/UserSearchDataSource.java b/src/main/java/org/olat/user/ui/admin/UserSearchDataSource.java
index bb589dbda41..1b5d185f26b 100644
--- a/src/main/java/org/olat/user/ui/admin/UserSearchDataSource.java
+++ b/src/main/java/org/olat/user/ui/admin/UserSearchDataSource.java
@@ -97,10 +97,12 @@ public class UserSearchDataSource implements FlexiTableDataSourceDelegate<Identi
private List<Integer> getStatusFromFilter(List<FlexiTableFilter> filters) {
List<Integer> statusList = new ArrayList<>();
- for(FlexiTableFilter filter:filters) {
- if(!filter.isShowAll() && StringHelper.isLong(filter.getFilter())) {
- statusList.add(Integer.parseInt(filter.getFilter()));
- }
+ if(filters != null && !filters.isEmpty()) {
+ for(FlexiTableFilter filter:filters) {
+ if(!filter.isShowAll() && StringHelper.isLong(filter.getFilter())) {
+ statusList.add(Integer.parseInt(filter.getFilter()));
+ }
+ }
}
return statusList;
}
--
GitLab