Remove unnecessary subobjects flag in buildMergedMappers

this sneaked in while resolving merge conflicts
felixbarny · Apr 9, 2024 · b049ca9 · b049ca9
1 parent ea535da
commit b049ca9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java
@@ -515,7 +515,7 @@ static MergeResult build(ObjectMapper existing, ObjectMapper mergeWithObject, Ma
                 subObjects = existing.subobjects;
             }
             MapperMergeContext objectMergeContext = existing.createChildContext(parentMergeContext, existing.simpleName());
-            Map<String, Mapper> mergedMappers = buildMergedMappers(existing, mergeWithObject, objectMergeContext, subObjects.value());
+            Map<String, Mapper> mergedMappers = buildMergedMappers(existing, mergeWithObject, objectMergeContext);
             return new MergeResult(
                 enabled,
                 subObjects,
@@ -527,8 +527,7 @@ static MergeResult build(ObjectMapper existing, ObjectMapper mergeWithObject, Ma
         private static Map<String, Mapper> buildMergedMappers(
             ObjectMapper existing,
             ObjectMapper mergeWithObject,
-            MapperMergeContext objectMergeContext,
-            boolean subobjects
+            MapperMergeContext objectMergeContext
         ) {
             Iterator<Mapper> iterator = mergeWithObject.iterator();
             if (iterator.hasNext() == false) {