aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2021-10-01 16:56:32 +0200
committerGitHub <noreply@github.com>2021-10-01 16:56:32 +0200
commit4fe9367ec8e0153330dde29294525f6893079e77 (patch)
tree0c8358793ce1c1bc1c5cb1171aa578219e73b5a9 /config-model/src/main/java
parent82a8c6019b9a961a26be658cb6c15d21bea158f1 (diff)
parent3b28877e3f8492df65051c1e6f9d85c6a65a8378 (diff)
Merge pull request #19400 from vespa-engine/geirst/fix-importing-complex-fields-from-parents-using-inheritance
Fix importing complex fields from parents using inheritance
Diffstat (limited to 'config-model/src/main/java')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
index 02df81fbbb3..4d553054aaf 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
@@ -293,7 +293,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
for (Field field : subType.fieldSet()) {
SDField subField = new SDField(sdoc, name.concat(".").concat(field.getName()), field.getDataType(),
subType, new Matching(), true, recursion + 1);
- structFields.put(field.getName(), subField);
+ structFields.putIfAbsent(field.getName(), subField);
}
}
}