Fixed OperationResultStatus header value.

Evolveum · Jan 12, 2017 · ba57d50 · ba57d50
1 parent 0b1a6a2
commit ba57d50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java
@@ -16,6 +16,7 @@
 package com.evolveum.midpoint.schema.result;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * 
@@ -101,6 +102,7 @@ public static OperationResultStatus parseStatusType(OperationResultStatusType st
 		}
 	}
 
+	@NotNull
 	public static OperationResultStatusType createStatusType(OperationResultStatus status) {
 		if (status == null) {
 			return OperationResultStatusType.UNKNOWN;

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
@@ -20,6 +20,7 @@
 import com.evolveum.midpoint.model.impl.security.SecurityHelper;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.security.api.ConnectionEnvironment;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.exception.*;
@@ -100,7 +101,7 @@ public static void finishRequest(Task task, SecurityHelper securityHelper) {
 	// slightly experimental
 	public static Response.ResponseBuilder createResultHeaders(Response.ResponseBuilder builder, OperationResult result) {
 		return builder
-				.header(OPERATION_RESULT_STATUS, result.getStatus())
+				.header(OPERATION_RESULT_STATUS, OperationResultStatus.createStatusType(result.getStatus()).value())
 				.header(OPERATION_RESULT_MESSAGE, result.getMessage());
 	}
 }