fix for MID-5479

Evolveum · Jul 3, 2019 · 406d71c · 406d71c
1 parent 7a6d930
commit 406d71c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismValueWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismValueWrapperImpl.java
@@ -65,12 +65,18 @@ public <D extends ItemDelta<V, ID>, ID extends ItemDefinition> void addToDelta(D
 				}
 			case MODIFIED:				
 				if (parent.isSingleValue()) {
-					delta.addValueToReplace((V) newValue.clone());
+					if (newValue.isEmpty())  {
+						delta.addValueToReplace(null);
+					} else {
+						delta.addValueToReplace((V) newValue.clone());
+					}
 					break;
 				}
 
 				delta.addValueToAdd((V) newValue.clone());
-				delta.addValueToDelete((V) oldValue.clone());
+				if (!oldValue.isEmpty()) {
+					delta.addValueToDelete((V) oldValue.clone());
+				}
 				break;
 			case DELETED:
 				delta.addValueToDelete((V) oldValue.clone());