From 547942cd382c0212a72b528aaa85aa686f7c1d83 Mon Sep 17 00:00:00 2001 From: Antti Villberg Date: Mon, 9 Oct 2017 20:06:15 +0300 Subject: [PATCH] Remove merge semantics of CommandContext keys refs #7533 Change-Id: I2b1ff40aa64fbb10d215641962866dad634df472 --- .../simantics/document/server/io/CommandContextImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java b/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java index 5fb3a283e..8ff198cbf 100644 --- a/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java +++ b/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/CommandContextImpl.java @@ -67,13 +67,7 @@ public class CommandContextImpl implements CommandContextMutable { Map>> from = context.getData(); for (Map.Entry>> entry : from.entrySet()) { String key = entry.getKey(); - Object existing = getValue(key); - Object newValue = context.getValue(key); - // Do not merge duplicates! - if (newValue != null && newValue.equals(existing)) - continue; - List> rows = ensureRowsAvailable(entry.getKey()); - rows.addAll(entry.getValue()); + putValue(key, context.getValue(key)); } } return this; -- 2.47.1