Fixing consistence result storage in shadows

Evolveum · Aug 3, 2015 · ebace02 · ebace02
1 parent be4156b
commit ebace02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
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
@@ -1153,7 +1153,7 @@ public boolean handle(ShadowType shadowType) {
                     handleResult.computeStatus();
                     handleResult.recordSuccessIfUnknown();
 
-                    if (!handleResult.isSuccess()) {
+                    if (!handleResult.isSuccess() && !handleResult.isHandledError()) {
                         Collection<? extends ItemDelta> shadowModificationType = PropertyDelta
                                 .createModificationReplacePropertyCollection(ShadowType.F_RESULT,
                                         getResourceObjectShadowDefinition(), handleResult.createOperationResultType());

diff --git a/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java b/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
@@ -1178,10 +1178,10 @@ public int synchronize(ResourceShadowDiscriminator shadowCoordinates, PrismPrope
 				throw new SystemException("Synchronization error: " + ex.getMessage(), ex);
 			}
 
-			notifyChangeResult.computeStatus("Error by notify change operation.");
+			notifyChangeResult.computeStatus("Error in notify change operation.");
 
 			boolean successfull = false;
-			if (notifyChangeResult.isSuccess()) {
+			if (notifyChangeResult.isSuccess() || notifyChangeResult.isHandledError()) {
 				deleteShadowFromRepo(change, result);
 				successfull  = true;
 //				// get updated token from change,

diff --git a/testing/consistency-mechanism/.gitignore b/testing/consistency-mechanism/.gitignore
@@ -1,2 +1,3 @@
 /target
 /test-output
+/target/