Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 29, 2014 · abb542b · abb542b
2 parents 21f96e2 + 2e0ec30
commit abb542b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java b/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
@@ -242,8 +242,9 @@ public void notifyChange(ResourceObjectShadowChangeDescription change, Task task
 				Collection modifications = SynchronizationSituationUtil
 						.createSynchronizationSituationAndDescriptionDelta(object,
 								situation.getSituation(), task.getChannel(), false);
-				modifications.add(PropertyDelta.createModificationReplaceProperty(ShadowType.F_INTENT, object.getDefinition(), synchronizationPolicy.getIntent()));
-
+				if (StringUtils.isNotBlank(synchronizationPolicy.getIntent())){
+					modifications.add(PropertyDelta.createModificationReplaceProperty(ShadowType.F_INTENT, object.getDefinition(), synchronizationPolicy.getIntent()));
+				}
 				repositoryService.modifyObject(ShadowType.class, object.getOid(), modifications, subResult);
 				subResult.recordSuccess();
 				return;