Fixing UPDATE type of ICF delta

Evolveum · Nov 23, 2014 · c83bfd7 · c83bfd7
1 parent b60461c
commit c83bfd7
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java b/...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
@@ -2239,7 +2239,8 @@ private <T extends ShadowType> List<Change<T>> getChangesFromSyncDeltas(ObjectCl
 				ObjectClassComplexTypeDefinition objClassDefinition = (ObjectClassComplexTypeDefinition) schema
 				.findComplexTypeDefinition(objectClass);
 
-			if (SyncDeltaType.DELETE.equals(icfDelta.getDeltaType())) {
+			SyncDeltaType icfDeltaType = icfDelta.getDeltaType();
+			if (SyncDeltaType.DELETE.equals(icfDeltaType)) {
 				LOGGER.trace("START creating delta of type DELETE");
 				ObjectDelta<ShadowType> objectDelta = new ObjectDelta<ShadowType>(
 						ShadowType.class, ChangeType.DELETE, prismContext);
@@ -2254,7 +2255,7 @@ private <T extends ShadowType> List<Change<T>> getChangesFromSyncDeltas(ObjectCl
 				changeList.add(change);
 				LOGGER.trace("END creating delta of type DELETE");
 
-			} else if (SyncDeltaType.CREATE.equals(icfDelta.getDeltaType())) {
+			} else if (SyncDeltaType.CREATE.equals(icfDeltaType)) {
 				PrismObjectDefinition<ShadowType> objectDefinition = toShadowDefinition(objClassDefinition);
 				LOGGER.trace("Object definition: {}", objectDefinition);
 
@@ -2277,11 +2278,12 @@ private <T extends ShadowType> List<Change<T>> getChangesFromSyncDeltas(ObjectCl
 				changeList.add(change);
 				LOGGER.trace("END creating delta of type CREATE");
 
-			} else if (SyncDeltaType.CREATE_OR_UPDATE.equals(icfDelta.getDeltaType())) {
+			} else if (SyncDeltaType.CREATE_OR_UPDATE.equals(icfDeltaType) || 
+					SyncDeltaType.UPDATE.equals(icfDeltaType)) {
 				PrismObjectDefinition<ShadowType> objectDefinition = toShadowDefinition(objClassDefinition);
 				LOGGER.trace("Object definition: {}", objectDefinition);
 
-				LOGGER.trace("START creating delta of type CREATE_OR_UPDATE");
+				LOGGER.trace("START creating delta of type {}", icfDeltaType);
 				PrismObject<ShadowType> currentShadow = icfConvertor.convertToResourceObject(icfDelta.getObject(),
 						objectDefinition, false, caseIgnoreAttributeNames);
 
@@ -2294,10 +2296,10 @@ private <T extends ShadowType> List<Change<T>> getChangesFromSyncDeltas(ObjectCl
 				Change change = new Change(identifiers, currentShadow, getToken(icfDelta.getToken()));
 				change.setObjectClassDefinition(objClassDefinition);
 				changeList.add(change);
-				LOGGER.trace("END creating delta of type CREATE_OR_UPDATE");
+				LOGGER.trace("END creating delta of type {}", icfDeltaType);
 
 			} else {
-				throw new GenericFrameworkException("Unexpected sync delta type " + icfDelta.getDeltaType());
+				throw new GenericFrameworkException("Unexpected sync delta type " + icfDeltaType);
 			}
 
 		}