diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-03-09 14:16:57 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-03-09 19:10:27 +0000 |
commit | 0fb4a25549effe0340b8422c938a54a832379c6a (patch) | |
tree | 04e026be52e3ac5c3124914e2588c64d1bd386d0 | |
parent | 1fa852eadd7b09b98ce6dd8bdd7b0446d07a37d6 (diff) |
skip already ok inherits
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java index 0db810d5933..2cbaebbb79b 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java @@ -349,9 +349,11 @@ public class DocumentModelBuilder { } for (SDDocumentType type : sdoc.getTypes()) { for (SDDocumentType proxy : type.getInheritedTypes()) { - var inherited = targetDt.getDataTypeRecursive(proxy.getName()); + var inherited = (StructDataType) targetDt.getDataTypeRecursive(proxy.getName()); var converted = (StructDataType) targetDt.getDataType(type.getName()); - converted.inherit((StructDataType) inherited); + if (! converted.inherits(inherited)) { + converted.inherit(inherited); + } } } for (AnnotationType annotation : sdoc.getAnnotations().values()) { |