Merge remote-tracking branch 'origin/master'

Evolveum · Oct 2, 2019 · 51901f3 · 51901f3
2 parents 0f366ce + b9d2504
commit 51901f3
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -671,18 +671,24 @@ public void populateItem(Item<ICellPopulator<SelectableBean<CaseType>>> item, St
 					@Override
 					public String getObject() {
 						CaseType caseModelObject = rowModel.getObject().getValue();
-						if (caseModelObject == null || caseModelObject.getObjectRef() == null) {
+						if (caseModelObject == null) {
 							return "";
 						}
 						AssignmentHolderType objectRef = WebComponentUtil.getObjectFromAddDeltyForCase(caseModelObject);
 						if (objectRef != null){
 							return WebComponentUtil.getEffectiveName(objectRef, AbstractRoleType.F_DISPLAY_NAME);
-						} else {
-							try {
-								return WebComponentUtil.getEffectiveName(caseModelObject.getObjectRef(), AbstractRoleType.F_DISPLAY_NAME, pageBase,
-										pageBase.getClass().getSimpleName() + "." + "loadCaseObjectRefName");
-							} catch (Exception ex){
-								LOGGER.error("Unable find the object for reference: ", caseModelObject.getObjectRef());
+						} else if (caseModelObject.getObjectRef() != null
+								&& StringUtils.isNotEmpty(caseModelObject.getObjectRef().getOid())){
+							if (caseModelObject.getObjectRef().getObject() != null){
+									return WebComponentUtil.getEffectiveName(caseModelObject.getObjectRef().getObject(),
+											AbstractRoleType.F_DISPLAY_NAME);
+							} else {
+								try {
+									return WebComponentUtil.getEffectiveName(caseModelObject.getObjectRef(), AbstractRoleType.F_DISPLAY_NAME, pageBase,
+											pageBase.getClass().getSimpleName() + "." + "loadCaseObjectRefName");
+								} catch (Exception ex) {
+									LOGGER.error("Unable find the object for reference: ", caseModelObject.getObjectRef());
+								}
 							}
 						}
 						return "";