From 3361a9365bb69b360bdbeb9b668f61993fa95708 Mon Sep 17 00:00:00 2001 From: kimchy Date: Wed, 2 Mar 2011 03:01:01 +0200 Subject: [PATCH] since we now take all#enabled into account when checking for include_in_all, there is no need to set it on every mapper --- .../index/mapper/xcontent/XContentDocumentMapper.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java index 11520bc2323..d5efd6f797f 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDocumentMapper.java @@ -251,11 +251,6 @@ public class XContentDocumentMapper implements DocumentMapper, ToXContent { this.typeFilter = new TermFilter(typeMapper().term(type)); - // if we are not enabling all, set it to false on the root object, (and on all the rest...) - if (!allFieldMapper.enabled()) { - this.rootObjectMapper.includeInAll(allFieldMapper.enabled()); - } - rootObjectMapper.putMapper(idFieldMapper); if (boostFieldMapper != null) { rootObjectMapper.putMapper(boostFieldMapper);