Backporting result computation fix

Evolveum · Mar 30, 2013 · 6c485c3 · 6c485c3
1 parent cc4cc7e
commit 6c485c3
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
@@ -505,6 +505,7 @@ public void computeStatusComposite() {
 		boolean allOk = true;
 		boolean allNotApplicable = true;
 		boolean hasInProgress = false;
+		boolean hasHandledError = false;
 		for (OperationResult sub : getSubresults()) {
 			if (sub.getStatus() != OperationResultStatus.NOT_APPLICABLE) {
 				allNotApplicable = false;
@@ -533,12 +534,24 @@ public void computeStatusComposite() {
 					message = message + ", " + sub.getMessage();
 				}
 			}
+			if (sub.getStatus() == OperationResultStatus.HANDLED_ERROR) {
+				hasHandledError = true;
+				if (message == null) {
+					message = sub.getMessage();
+				} else {
+					message = message + ", " + sub.getMessage();
+				}
+			}
 		}
 
 		if (allNotApplicable) {
 			status = OperationResultStatus.NOT_APPLICABLE;
 		} else if (allOk) {
-			status = OperationResultStatus.SUCCESS;
+			if (hasHandledError) {
+				status = OperationResultStatus.HANDLED_ERROR;
+			} else {
+				status = OperationResultStatus.SUCCESS;
+			}
 		} else if (hasInProgress) {
 			status = OperationResultStatus.IN_PROGRESS;
 		} else {