From 7160a38bd5df3245055ddff46c9628a2f5bb52d6 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Fri, 21 Oct 2016 11:41:00 +0200
Subject: [PATCH] Fixing NPE in object merge code (MID-3460)

---
 .../evolveum/midpoint/model/impl/controller/ObjectMerger.java  | 3 +++
 1 file changed, 3 insertions(+)

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
index b9bb70d8d32..3cb73f5ca52 100644
--- 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) {