be a bit more paranoid

1 files changed, 7 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
index 118714ca2b1..8848759b415 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
@@ -48,9 +48,14 @@ public class DataTypeRepo implements DataTypeCollection {
         {
             throw new IllegalStateException("Data type '" + type.getName() + "' is not registered.");
         }
-        typeByName.remove(type.getName());
+        var oldByName = typeByName.remove(type.getName());
+        var oldById = typeById.remove(type.getId());
+        if (oldByName != oldById) {
+            throw new IllegalStateException("Data type '" + type.getName() +
+                                            "' inconsistent replace, by name: " + oldByName
+                                            + " but by id: " + oldById);
+        }
         typeByName.put(type.getName(), type);
-        typeById.remove(type.getId());
         typeById.put(type.getId(), type);
         return this;
     }