diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-06-07 08:36:38 +0000 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:30 +0200 |
commit | a3836826938bd0414a611c79beadeedd644c6fb0 (patch) | |
tree | 48d7875df9ab0b4ce2c03b702737bdbf27948181 /config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java | |
parent | cb830cc2153ecc488eb532784e115e0ba7e37d26 (diff) |
add fieldsets after inheriting
* bad design of DocumentType class (in both Java and C++)
causes silent failures when this is done in the wrong order.
Diffstat (limited to 'config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java index 9f1203ffc9f..fd493a90249 100644 --- a/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java +++ b/config-model/src/main/java/com/yahoo/schema/parser/ConvertParsedTypes.java @@ -170,10 +170,10 @@ public class ConvertParsedTypes { for (var fieldset : schema.getFieldSets()) { fieldSets.put(fieldset.name(), fieldset.getFieldNames()); } - docToFill.addFieldSets(fieldSets); for (String inherit : doc.getInherited()) { docToFill.inherit(findDocFromSchemas(inherit)); } + docToFill.addFieldSets(fieldSets); } } |