#26990 prevent duplicate fields when mixing parent and root nested in…

…cludes (follow up)
elastic · Oct 27, 2017 · a043337 · a043337
1 parent 335a237
commit a043337
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java
@@ -96,12 +96,12 @@ private static void fixRedundantIncludes(ObjectMapper.Builder omb, boolean paren
                     ObjectMapper.Builder child = (ObjectMapper.Builder) mapper;
                     Nested nested = child.nested;
                     boolean isNested = nested.isNested();
-                    boolean includedInParent = parentIncluded && isNested && nested.isIncludeInParent();
+                    boolean includeInRootViaParent = parentIncluded && isNested && nested.isIncludeInParent();
                     boolean includedInRoot = isNested && nested.isIncludeInRoot();
-                    if (includedInParent && includedInRoot) {
+                    if (includeInRootViaParent && includedInRoot) {
                         child.nested = Nested.newNested(true, false);
                     }
-                    fixRedundantIncludes(child, includedInParent || includedInRoot);
+                    fixRedundantIncludes(child, includeInRootViaParent || includedInRoot);
                 }
             }
         }