diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/cluster')
-rw-r--r-- | core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java | 1 | ||||
-rw-r--r-- | core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java index 4ba244e107..5bba34904d 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java @@ -26,6 +26,7 @@ import org.elasticsearch.cluster.AbstractDiffable; import org.elasticsearch.cluster.Diff; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.bytes.BytesArray; +import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.compress.CompressedXContent; diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 0efb640c5a..0bde4a23b0 100644 --- a/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -265,11 +265,13 @@ public class MetaDataCreateIndexService extends AbstractComponent { for (IndexTemplateMetaData template : templates) { templateNames.add(template.getName()); for (ObjectObjectCursor<String, CompressedXContent> cursor : template.mappings()) { + String mappingString = cursor.value.string(); if (mappings.containsKey(cursor.key)) { XContentHelper.mergeDefaults(mappings.get(cursor.key), - MapperService.parseMapping(xContentRegistry, cursor.value.string())); + MapperService.parseMapping(xContentRegistry, mappingString)); } else { - mappings.put(cursor.key, MapperService.parseMapping(xContentRegistry, cursor.value.string())); + mappings.put(cursor.key, + MapperService.parseMapping(xContentRegistry, mappingString)); } } // handle custom |