Using root object level mapping (_size, _source) can cause reparsing …

…of the mapping on startup, close elastic#1458.
dadoonet · Nov 13, 2011 · 2971671 · 2971671
1 parent a56947b
commit 2971671
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/object/ObjectMapper.java
@@ -866,8 +866,13 @@ public void toXContent(XContentBuilder builder, Params params, ToXContent custom
                 mapper.toXContent(builder, params);
             }
         }
-        if (additionalMappers != null) {
+        if (additionalMappers != null && additionalMappers.length > 0) {
+            TreeMap<String, Mapper> additionalSortedMappers = new TreeMap<String, Mapper>();
             for (Mapper mapper : additionalMappers) {
+                additionalSortedMappers.put(mapper.name(), mapper);
+            }
+
+            for (Mapper mapper : additionalSortedMappers.values()) {
                 mapper.toXContent(builder, params);
             }
         }