Merge remote-tracking branch 'origin/master'

Evolveum · Aug 9, 2019 · d8af16f · d8af16f
2 parents d172566 + 64cdd2d
commit d8af16f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java
@@ -83,7 +83,7 @@ public void onClick(final Optional<AjaxRequestTarget> target)
             {
                 setSelectedTab(index);
                 onTabChange(index);
-                if (target != null && target.get() != null)
+                if (target != null && target.isPresent() && target.get() != null)
                 {
                     target.get().add(AjaxTabbedPanel.this);
                 }

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
@@ -551,8 +551,8 @@ public void populateItem(Item<ICellPopulator<PrismContainerValueWrapper<CaseWork
 
 				CaseWorkItemType caseWorkItemType = unwrapRowModel(rowModel);
 				CaseType caseType = CaseTypeUtil.getCase(caseWorkItemType);
-				PrismReferenceValue refVal = caseType.getTargetRef().asReferenceValue();
-				String descriptionValue = refVal.getObject() != null ?
+				PrismReferenceValue refVal = caseType.getTargetRef() != null ? caseType.getTargetRef().asReferenceValue() : null;
+				String descriptionValue = refVal != null && refVal.getObject() != null ?
 						refVal.getObject().asObjectable().getDescription() : "";
 
 				c.add(new AttributeAppender("title", descriptionValue));