Role Catalog fix

Evolveum · Dec 6, 2016 · 216e29f · 216e29f
1 parent 2eb41ec
commit 216e29f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
@@ -338,9 +338,12 @@ private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
     }
 
     protected ObjectQuery createContentQuery(ObjectQuery searchQuery) {
-        ObjectQuery memberQuery;
+        ObjectQuery memberQuery = null;
         if (AssignmentViewType.ROLE_CATALOG_VIEW.equals(AssignmentViewType.getViewTypeFromSession(pageBase))){
-            memberQuery = createMemberQuery(selectedTreeItemOidModel.getObject());
+            String oid = selectedTreeItemOidModel.getObject();
+            if (StringUtils.isNotEmpty(oid)) {
+                memberQuery = createMemberQuery(oid);
+            }
         } else {
             memberQuery = createMemberQuery(getViewTypeClass(AssignmentViewType.getViewTypeFromSession(pageBase)));
         }