Fixed reference to ModelService in ObjectMerger.

Evolveum · Oct 13, 2016 · aef4959 · aef4959
1 parent 750f3ff
commit aef4959
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.evolveum.midpoint.model.api.ModelService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -98,7 +99,7 @@ public class ObjectMerger {
 	// But cannot fix it right now. TODO: later refactor.
 	// MID-3459
 	@Autowired(required = true)
-	private ModelController modelController;
+	private ModelService modelController;
 
 	public <O extends ObjectType> Collection<ObjectDeltaOperation<? extends ObjectType>> mergeObjects(Class<O> type, 
 			String leftOid, String rightOid, String mergeConfigurationName, Task task, OperationResult result)