fix parent field mapper to copy customFieldDataSettings on merge

This commit is contained in:
Ryan Ernst 2015-06-19 16:48:34 -07:00
parent 0a5e763697
commit aa4369f55b

@ -348,6 +348,12 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
ParentFieldMapper fieldMergeWith = (ParentFieldMapper) mergeWith;
this.fieldType = fieldMergeWith.fieldType().clone();
this.fieldType().freeze();
if (fieldMergeWith.customFieldDataSettings != null) {
if (!Objects.equal(fieldMergeWith.customFieldDataSettings, this.customFieldDataSettings)) {
this.customFieldDataSettings = fieldMergeWith.customFieldDataSettings;
}
}
}
}