From 5073ea82d26954fafc4eeb18993dc6358f805764 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Thu, 13 Dec 2018 09:38:50 +0100 Subject: [PATCH] Fix NPE when assigning/unassigning (MID-5027) When creating objects it is strongly advised to provide prismContext e.g. using the constructor parameter. --- .../com/evolveum/midpoint/gui/api/util/WebComponentUtil.java | 2 +- .../midpoint/web/page/admin/resources/ResourceContentPanel.java | 2 +- .../evolveum/midpoint/web/page/admin/server/PageTaskAdd.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java index b3400f22376..9c24effaf11 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java @@ -573,7 +573,7 @@ public static QName classToQName(PrismContext prismContex public static TaskType createSingleRecurrenceTask(String taskName, QName applicableType, ObjectQuery query, ObjectDelta delta, ModelExecuteOptions options, String category, PageBase pageBase) throws SchemaException { - TaskType task = new TaskType(); + TaskType task = new TaskType(pageBase.getPrismContext()); MidPointPrincipal owner = SecurityUtils.getPrincipalUser(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java index cff072998e5..e556cf0200e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java @@ -413,7 +413,7 @@ public void onClick(AjaxRequestTarget target) { } private void newTaskPerformed(String category, AjaxRequestTarget target) { - TaskType taskType = new TaskType(); + TaskType taskType = new TaskType(getPageBase().getPrismContext()); PrismProperty pKind; try { pKind = taskType.asPrismObject().findOrCreateProperty( diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java index c6bcc0dc5a9..43ba0a23811 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java @@ -674,7 +674,7 @@ private List> prepareChangesToExecute(TaskType } private TaskType createTask(TaskAddDto dto) throws SchemaException { - TaskType task = new TaskType(); + TaskType task = new TaskType(getPrismContext()); MidPointPrincipal owner = SecurityUtils.getPrincipalUser(); ObjectReferenceType ownerRef = new ObjectReferenceType();