Fixing NPE in object merge code (MID-3460)

Evolveum · Oct 21, 2016 · 7160a38 · 7160a38
1 parent d2c22da
commit 7160a38
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
@@ -362,6 +362,9 @@ private Collection<PrismValue> diffValues(List<PrismValue> currentValues, Collec
 	private <O extends ObjectType, I extends Item> Collection<PrismValue> getValuesToTake(PrismObject<O> objectLeft, PrismObject<O> objectRight, 
 			String side, I origItem, MergeStategyType strategy, Expression<PrismValue, ItemDefinition> valueExpression, Task task, OperationResult result) 
 					throws ConfigurationException, SchemaException, ExpressionEvaluationException, ObjectNotFoundException {
+		if (origItem == null) {
+			return new ArrayList<>(0);
+		}
 		if (strategy == MergeStategyType.TAKE) {
 			return cleanContainerIds(origItem.getClonedValues());
 		} else if (strategy == MergeStategyType.EXPRESSION) {