fixing displaying error messages on task error tab panel (MID-7005)

Evolveum · Apr 27, 2021 · 9c1cf06 · 9c1cf06
1 parent 42fd7ef
commit 9c1cf06
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/...ain/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskErrorSelectableBeanImpl.java b/...ain/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskErrorSelectableBeanImpl.java
@@ -6,22 +6,18 @@
  */
 package com.evolveum.midpoint.web.page.admin.server.dto;
 
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
-import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.SelectableBeanImpl;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by honchar.
@@ -65,6 +61,11 @@ public TaskErrorSelectableBeanImpl(@NotNull O object, @NotNull String taskOid) {
 
     private String extractMessages(OperationExecutionType execution) {
         List<String> messages = new ArrayList<>();
+        if (execution.getMessage() != null) {
+            message = execution.getMessage();
+            return message;
+        }
+
         for (ObjectDeltaOperationType deltaOperation : execution.getOperation()) {
             OperationResultType result = deltaOperation.getExecutionResult();
             if (result == null || result.getMessage() == null) {