Fix op. result handling in provisioning.addObject

(fixes TestSanity.test006reimportResourceDummy)
Evolveum · Jun 29, 2019 · b755271 · b755271
1 parent 32bf0ec
commit b755271
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
@@ -942,7 +942,6 @@ private <T extends ObjectType, F extends ObjectType> PrismObject<T> executeDelta
 		PrismObject<T> objectAfterModification = null;
 
 		try {
-
 			if (objectDelta.getChangeType() == ChangeType.ADD) {
 				objectAfterModification = executeAddition(objectDelta, context, objectContext, options, resource, task, result);
 			} else if (objectDelta.getChangeType() == ChangeType.MODIFY) {

diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
@@ -318,8 +318,14 @@ public <T extends ObjectType> String addObject(PrismObject<T> object, OperationP
 			if (ProvisioningOperationOptions.isOverwrite(options)){
 				addOptions = RepoAddOptions.createOverwrite();
 			}
-			oid = cacheRepositoryService.addObject(object, addOptions, result);
-			result.computeStatus();
+			try {
+				oid = cacheRepositoryService.addObject(object, addOptions, result);
+			} catch (Throwable t) {
+				result.recordFatalError(t);
+				throw t;
+			} finally {
+				result.computeStatusIfUnknown();
+			}
 		}
 
 		result.cleanupResult();

diff --git a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
@@ -922,10 +922,10 @@ public void test006reimportResourceDummy() throws Exception{
 		} catch (FaultMessage ex) {
 			LOGGER.info("fault {}", ex.getFaultInfo());
 			LOGGER.info("fault {}", ex.getCause());
-			if (ex.getFaultInfo() instanceof ObjectAlreadyExistsFaultType){
+			if (ex.getFaultInfo() instanceof ObjectAlreadyExistsFaultType) {
 			// this is OK, we expect this
 			} else{
-				fail("Expected object already exists exception, but haven't got one.");
+				fail("Expected object already exists exception, but got: " + ex.getFaultInfo());
 			}
 
 		}