Merge remote-tracking branch 'origin/master' into feature/hibernate5

Evolveum · Dec 8, 2017 · 7d50023 · 7d50023
2 parents 41eec9d + b2131c8
commit 7d50023
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
@@ -386,7 +386,7 @@ public PrismContainer<C> createContainerAddDelta() throws SchemaException {
 				continue;
 			}
 
-			if (containerAdd.isSingleValue()) {
+			if (containerAdd.isSingleValue() || containerAdd.isEmpty()) {
 				containerAdd.replace(newContainerValue);
 			} else {
 				containerAdd.add(newContainerValue);