Test and fix for delete parallel problems

Evolveum · Sep 12, 2017 · f748f66 · f748f66
1 parent 2231fbb
commit f748f66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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
@@ -1052,7 +1052,7 @@ private boolean isOverGrace(XMLGregorianCalendar now, Duration gracePeriod, XMLG
 	}
 
 	private boolean isCompleted(OperationResultStatusType statusType) {
-		 return statusType != OperationResultStatusType.IN_PROGRESS && statusType != OperationResultStatusType.UNKNOWN;
+		 return statusType != null && statusType != OperationResultStatusType.IN_PROGRESS && statusType != OperationResultStatusType.UNKNOWN;
 	}
 
 	private List<PendingOperationType> sortOperations(List<PendingOperationType> pendingOperations) {

diff --git a/provisioning/provisioning-impl/src/test/resources/dummy/dummy-parallelism/resource-dummy.xml b/provisioning/provisioning-impl/src/test/resources/dummy/dummy-parallelism/resource-dummy.xml
@@ -199,6 +199,7 @@
 		<useProposedShadows>true</useProposedShadows>
 		<recordPendingOperations>all</recordPendingOperations>
 		<avoidDuplicateOperations>true</avoidDuplicateOperations>
+		<pendingOperationGracePeriod>PT15M</pendingOperationGracePeriod> <!-- Not need for this. But presence of grace period may induce some bugs -->
 	</consistency>
 
 </resource>