request a role page: fixed InOidFilter for query

Evolveum · Jun 22, 2016 · 3805729 · 3805729
1 parent 28ad3c8
commit 3805729
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java b/.../main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
@@ -402,8 +402,11 @@ private <T extends FocusType> List<AssignmentEditorDto> getAvailableAssignmentsD
                 && filterModel != null && filterModel.getObject() != null
                 && query.getFilter() == null) {
             query.setFilter(filterModel.getObject());
-            InOidFilter oidsFilter = InOidFilter.createInOid(getAssignmentOids(currentAssignments));
-            query.addFilter(oidsFilter);
+            List<String> oidsList = getAssignmentOids(currentAssignments);
+            if (oidsList != null && oidsList.size() > 0) {
+                InOidFilter oidsFilter = InOidFilter.createInOid(oidsList);
+                query.addFilter(oidsFilter);
+            }
         }
         filterObjectIsAdded = false;
         return applyQueryToListProvider(query, currentAssignments);