Fixes after refactoring.

Evolveum · Jul 30, 2014 · 1c579c7 · 1c579c7
1 parent 0bdde0f
commit 1c579c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
@@ -936,6 +936,13 @@ public static void applyTo(Collection<? extends ItemDelta> deltas, PrismContaine
 		}
 	}
 
+	public static void applyToMatchingPath(Collection<? extends ItemDelta> deltas, PrismContainer propertyContainer)
+			throws SchemaException {
+		for (ItemDelta delta : deltas) {
+			delta.applyToMatchingPath(propertyContainer);
+		}
+	}
+
 	public void applyTo(Item item) throws SchemaException {
 		ItemPath itemPath = item.getPath();
 		ItemPath deltaPath = getPath();
@@ -947,7 +954,7 @@ public void applyTo(Item item) throws SchemaException {
 			if (item instanceof PrismContainer<?>) {
 				PrismContainer<?> container = (PrismContainer<?>)item;
 				ItemPath remainderPath = deltaPath.remainder(itemPath);
-				Item subItem = container.findOrCreateItem(remainderPath, getItemClass());
+				Item subItem = container.findOrCreateItem(remainderPath, getItemClass(), getDefinition());
 				applyToMatchingPath(subItem);
 			} else {
 				throw new SchemaException("Cannot apply delta "+this+" to "+item+" as delta path is below the item path and the item is not a container");

diff --git a/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/...g-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
@@ -625,7 +625,7 @@ private Collection<PropertyModificationOperation> distillRenameDeltas(Collection
 			return null;
 		}
 
-				PrismProperty<String> name = nameDelta.getPropertyNew();
+				PrismProperty<String> name = nameDelta.getPropertyNewMatchingPath();
 				String newName = name.getRealValue();
 
 				Collection<PropertyModificationOperation> deltas = new ArrayList<PropertyModificationOperation>();