From 216e29f65c27c11d5b80a0939ee16a36445e58fd Mon Sep 17 00:00:00 2001
From: honchar <honchar@evolveum.com>
Date: Tue, 6 Dec 2016 13:43:47 +0100
Subject: [PATCH] Role Catalog fix

---
 .../web/component/assignment/AssignmentCatalogPanel.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
index c6a6fd6824e..5dd757dcd52 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
+++ b/gui/admin-gui/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)));
         }