fix Conflicting modification in delta exceptions when delta has no mo…

…difications in conflict
Evolveum · Nov 2, 2018 · d8011a7 · d8011a7
1 parent 9943fd8
commit d8011a7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
@@ -169,16 +169,18 @@ private Collection findItemValues(Long id, ItemPath path, Collection<PrismContai
 		if (cvalues == null) {
 			return null;
 		}
+		boolean foundValuesOnPath = false;
 		Collection<PrismValue> subValues = new ArrayList<PrismValue>();
 		for (PrismContainerValue<V> cvalue: cvalues) {
 			if (id == null || id == cvalue.getId()) {
 				Item<?,?> item = cvalue.findItem(path);
 				if (item != null) {
 					subValues.addAll(PrismValue.cloneCollection(item.getValues()));
+					foundValuesOnPath = true;
 				}
 			}
 		}
-		return subValues;
+		return foundValuesOnPath ? subValues : null;
 	}
 
 	/**